diff --git a/Assets/Accounts/Tests/AccountsTests.asmdef b/Assets/Accounts/Tests/AccountsTests.asmdef
index 5167069..a492685 100644
--- a/Assets/Accounts/Tests/AccountsTests.asmdef
+++ b/Assets/Accounts/Tests/AccountsTests.asmdef
@@ -6,7 +6,7 @@
         "UnityEditor.TestRunner",
         "AccountsScripts",
         "InterfacesScripts",
-        "SystemArchitecture"
+        "ArchitectureScripts"
     ],
     "includePlatforms": [
         "Editor"
diff --git a/Assets/Common/PlayModeTests/CommonPlayModeTests.asmdef b/Assets/Common/PlayModeTests/CommonPlayModeTests.asmdef
index 0ea4cd7..efc27fc 100644
--- a/Assets/Common/PlayModeTests/CommonPlayModeTests.asmdef
+++ b/Assets/Common/PlayModeTests/CommonPlayModeTests.asmdef
@@ -10,7 +10,7 @@
         "Unity.TextMeshPro",
         "AccountsScripts",
         "SignPredictor",
-        "SystemArchitecture"
+        "ArchitectureScripts"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Assets/Common/Tests/CommonTests.asmdef b/Assets/Common/Tests/CommonTests.asmdef
index 3a38e25..a568a8e 100644
--- a/Assets/Common/Tests/CommonTests.asmdef
+++ b/Assets/Common/Tests/CommonTests.asmdef
@@ -7,8 +7,8 @@
         "CommonScripts",
         "InterfacesScripts",
         "SignPredictor",
-        "SystemArchitecture",
-        "NatML.ML"
+        "NatML.ML",
+        "ArchitectureScripts"
     ],
     "includePlatforms": [
         "Editor"
diff --git a/Assets/Courses/PlayModeTests/PlayModeTests.asmdef b/Assets/Courses/PlayModeTests/PlayModeTests.asmdef
index 176f405..081dc61 100644
--- a/Assets/Courses/PlayModeTests/PlayModeTests.asmdef
+++ b/Assets/Courses/PlayModeTests/PlayModeTests.asmdef
@@ -4,7 +4,7 @@
     "references": [
         "UnityEngine.TestRunner",
         "UnityEditor.TestRunner",
-        "SystemArchitecture"
+        "ArchitectureScripts"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Assets/Courses/Scripts/CourseScripts.asmdef b/Assets/Courses/Scripts/CourseScripts.asmdef
index a8b163e..cc39d5f 100644
--- a/Assets/Courses/Scripts/CourseScripts.asmdef
+++ b/Assets/Courses/Scripts/CourseScripts.asmdef
@@ -7,8 +7,8 @@
         "InterfacesScripts",
         "SignPredictor",
         "NatML.ML",
-        "SystemArchitecture",
-        "Tween"
+        "Tween",
+        "ArchitectureScripts"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Assets/SpellingBee/PlayModeTests/SpellingBeePlayModeTests.asmdef b/Assets/SpellingBee/PlayModeTests/SpellingBeePlayModeTests.asmdef
index 7c82f99..90cc80d 100644
--- a/Assets/SpellingBee/PlayModeTests/SpellingBeePlayModeTests.asmdef
+++ b/Assets/SpellingBee/PlayModeTests/SpellingBeePlayModeTests.asmdef
@@ -8,7 +8,7 @@
         "Unity.TextMeshPro",
         "SpellingBeeScripts",
         "AccountsScripts",
-        "SystemArchitecture",
+        "ArchitectureScripts",
         "SignPredictor",
         "MinigameScripts"
     ],
diff --git a/Assets/SystemArchitecture/Scripts/SystemArchitectureScripts.asmdef b/Assets/SystemArchitecture/Scripts/ArchitectureScripts.asmdef
similarity index 90%
rename from Assets/SystemArchitecture/Scripts/SystemArchitectureScripts.asmdef
rename to Assets/SystemArchitecture/Scripts/ArchitectureScripts.asmdef
index ffce47e..0503acd 100644
--- a/Assets/SystemArchitecture/Scripts/SystemArchitectureScripts.asmdef
+++ b/Assets/SystemArchitecture/Scripts/ArchitectureScripts.asmdef
@@ -1,5 +1,5 @@
 {
-    "name": "SystemArchitecture",
+    "name": "ArchitectureScripts",
     "rootNamespace": "",
     "references": [],
     "includePlatforms": [],
diff --git a/Assets/SystemArchitecture/Scripts/SystemArchitectureScripts.asmdef.meta b/Assets/SystemArchitecture/Scripts/ArchitectureScripts.asmdef.meta
similarity index 100%
rename from Assets/SystemArchitecture/Scripts/SystemArchitectureScripts.asmdef.meta
rename to Assets/SystemArchitecture/Scripts/ArchitectureScripts.asmdef.meta
diff --git a/Assets/SystemArchitecture/Tests/SystemArchitectureTests.asmdef b/Assets/SystemArchitecture/Tests/ArchitectureTests.asmdef
similarity index 78%
rename from Assets/SystemArchitecture/Tests/SystemArchitectureTests.asmdef
rename to Assets/SystemArchitecture/Tests/ArchitectureTests.asmdef
index 254bdab..0192c2f 100644
--- a/Assets/SystemArchitecture/Tests/SystemArchitectureTests.asmdef
+++ b/Assets/SystemArchitecture/Tests/ArchitectureTests.asmdef
@@ -1,14 +1,12 @@
 {
-    "name": "SystemArchitectureTests",
+    "name": "ArchitectureTests",
     "rootNamespace": "",
     "references": [
         "UnityEditor.TestRunner",
         "UnityEngine.TestRunner",
-        "SystemArchitecture"
-    ],
-    "includePlatforms": [
-        "Editor"
+        "ArchitectureScripts"
     ],
+    "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
     "overrideReferences": true,
diff --git a/Assets/SystemArchitecture/Tests/SystemArchitectureTests.asmdef.meta b/Assets/SystemArchitecture/Tests/ArchitectureTests.asmdef.meta
similarity index 100%
rename from Assets/SystemArchitecture/Tests/SystemArchitectureTests.asmdef.meta
rename to Assets/SystemArchitecture/Tests/ArchitectureTests.asmdef.meta