diff --git a/ArchUnitNET/Loader/ArchBuilder.cs b/ArchUnitNET/Loader/ArchBuilder.cs
index 55919fda..095b0805 100644
--- a/ArchUnitNET/Loader/ArchBuilder.cs
+++ b/ArchUnitNET/Loader/ArchBuilder.cs
@@ -44,10 +44,10 @@ public void AddAssembly([NotNull] AssemblyDefinition moduleAssembly, bool isOnly
                 .MainModule.AssemblyReferences.Select(reference => reference.Name)
                 .ToList();
 
-            if (!_assemblyRegistry.ContainsAssembly(moduleAssembly.Name.FullName))
+            if (!_assemblyRegistry.ContainsAssembly(moduleAssembly.FullName))
             {
                 var assembly = _assemblyRegistry.GetOrCreateAssembly(
-                    moduleAssembly.Name.FullName,
+                    moduleAssembly.Name.Name,
                     moduleAssembly.FullName,
                     isOnlyReferenced,
                     references
diff --git a/ArchUnitNET/Loader/AssemblyRegistry.cs b/ArchUnitNET/Loader/AssemblyRegistry.cs
index 356a230c..4b746930 100644
--- a/ArchUnitNET/Loader/AssemblyRegistry.cs
+++ b/ArchUnitNET/Loader/AssemblyRegistry.cs
@@ -18,7 +18,7 @@ List<string> assemblyReferences
         )
         {
             return RegistryUtils.GetFromDictOrCreateAndAdd(
-                assemblyName,
+                assemblyFullName,
                 _assemblies,
                 s => new Assembly(
                     assemblyName,
diff --git a/ArchUnitNET/Loader/TypeFactory.cs b/ArchUnitNET/Loader/TypeFactory.cs
index 0745b7f1..e21770aa 100644
--- a/ArchUnitNET/Loader/TypeFactory.cs
+++ b/ArchUnitNET/Loader/TypeFactory.cs
@@ -361,7 +361,7 @@ TypeReference typeReference
                         typeReference.BuildFullName(),
                         typeReference.Name,
                         _assemblyRegistry.GetOrCreateAssembly(
-                            typeReference.Module.Assembly.Name.FullName,
+                            typeReference.Module.Assembly.Name.Name,
                             typeReference.Module.Assembly.FullName,
                             true,
                             null