diff --git a/src/FiscalOS.Core/Accounts/Institution.cs b/src/FiscalOS.Core/Accounts/Institution.cs
index 1551df4..85493d9 100644
--- a/src/FiscalOS.Core/Accounts/Institution.cs
+++ b/src/FiscalOS.Core/Accounts/Institution.cs
@@ -10,10 +10,10 @@ public sealed class Institution : Entity
   {
   }
 
-  public static Institution From(string name, InstitutionMetadata metadata)
+  public static Institution From(string? name, InstitutionMetadata metadata)
   {
-    ArgumentNullException.ThrowIfNull(name);
-    ArgumentNullException.ThrowIfNull(metadata);
+    ArgumentNullException.ThrowIfNull(name, nameof(name));
+    ArgumentNullException.ThrowIfNull(metadata, nameof(metadata));
 
     return new Institution()
     {
diff --git a/src/FiscalOS.Core/Identity/RefreshToken.cs b/src/FiscalOS.Core/Identity/RefreshToken.cs
index 55d9385..3f47b66 100644
--- a/src/FiscalOS.Core/Identity/RefreshToken.cs
+++ b/src/FiscalOS.Core/Identity/RefreshToken.cs
@@ -24,7 +24,7 @@ public sealed class RefreshToken : Entity
 
   public static RefreshToken From(User user, string token, DateTimeOffset expiresAt)
   {
-    ArgumentNullException.ThrowIfNull(user);
+    ArgumentNullException.ThrowIfNull(user, nameof(user));
 
     return new()
     {
diff --git a/src/FiscalOS.Core/Identity/User.cs b/src/FiscalOS.Core/Identity/User.cs
index e20f1c6..3c992cb 100644
--- a/src/FiscalOS.Core/Identity/User.cs
+++ b/src/FiscalOS.Core/Identity/User.cs
@@ -24,9 +24,9 @@ public sealed class User : Entity
 
   public static User From(string username, string hashedPassword, EncryptedDataKey encryptedDataKey)
   {
-    ArgumentNullException.ThrowIfNull(username);
-    ArgumentNullException.ThrowIfNull(hashedPassword);
-    ArgumentNullException.ThrowIfNull(encryptedDataKey);
+    ArgumentNullException.ThrowIfNull(username, nameof(username));
+    ArgumentNullException.ThrowIfNull(hashedPassword, nameof(hashedPassword));
+    ArgumentNullException.ThrowIfNull(encryptedDataKey, nameof(encryptedDataKey));
 
     return new()
     {
@@ -39,14 +39,14 @@ public sealed class User : Entity
 
   public void AddRefreshToken(RefreshToken refreshToken)
   {
-    ArgumentNullException.ThrowIfNull(refreshToken);
+    ArgumentNullException.ThrowIfNull(refreshToken, nameof(refreshToken));
 
     _refreshTokens.Add(refreshToken);
   }
 
   public void AddInstitution(Institution institution)
   {
-    ArgumentNullException.ThrowIfNull(institution);
+    ArgumentNullException.ThrowIfNull(institution, nameof(institution));
 
     _institutions.Add(institution);
   }
diff --git a/src/FiscalOS.Core/Security/EncryptedDataKey.cs b/src/FiscalOS.Core/Security/EncryptedDataKey.cs
index 9014cac..db71f0d 100644
--- a/src/FiscalOS.Core/Security/EncryptedDataKey.cs
+++ b/src/FiscalOS.Core/Security/EncryptedDataKey.cs
@@ -13,8 +13,8 @@ public sealed record EncryptedDataKey
 
   public static EncryptedDataKey From(string keyIdUsed, string encryptedKey)
   {
-    ArgumentNullException.ThrowIfNull(keyIdUsed);
-    ArgumentNullException.ThrowIfNull(encryptedKey);
+    ArgumentNullException.ThrowIfNull(keyIdUsed, nameof(keyIdUsed));
+    ArgumentNullException.ThrowIfNull(encryptedKey, nameof(encryptedKey));
 
     return new(keyIdUsed, encryptedKey);
   }
diff --git a/src/FiscalOS.Core/Security/KeyRingEntry.cs b/src/FiscalOS.Core/Security/KeyRingEntry.cs
index 8e945fd..d6b8f7b 100644
--- a/src/FiscalOS.Core/Security/KeyRingEntry.cs
+++ b/src/FiscalOS.Core/Security/KeyRingEntry.cs
@@ -13,8 +13,8 @@ public sealed record KeyRingEntry
 
   public static KeyRingEntry From(string keyId, string key)
   {
-    ArgumentNullException.ThrowIfNull(keyId);
-    ArgumentNullException.ThrowIfNull(key);
+    ArgumentNullException.ThrowIfNull(keyId, nameof(keyId));
+    ArgumentNullException.ThrowIfNull(key, nameof(key));
 
     return new(keyId, key);
   }