diff --git a/com.unity.netcode.gameobjects/CHANGELOG.md b/com.unity.netcode.gameobjects/CHANGELOG.md
index 425ad2e719..9e121fbd8c 100644
--- a/com.unity.netcode.gameobjects/CHANGELOG.md
+++ b/com.unity.netcode.gameobjects/CHANGELOG.md
@@ -15,15 +15,17 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Changed
 
+- Renamed the Editor assembly definition files to match their assembly names. Assembly names and GUIDs are unchanged. (#4187)
+
 ### Deprecated
 
 ### Removed
 
 ### Fixed
 
+- Fixed issue where a prefab added to a `NetworkPrefabsList` while a session was running was registered more than once and logged a duplicate `GlobalObjectIdHash` error. (#4184)
 - Issue where moving a `NetworkObject` into another scene made the clients that did not observe it log "Trying to synchronize NetworkObjectId but it was not spawned". The scene migration is now only sent to the clients that observe the `NetworkObject`. (#4176)
 - Issue where a `NetworkObject` that was moved into another scene while hidden from a client spawned in that client's active scene when it was shown with `NetworkShow`, instead of the scene it is in on the server. (#4176)
-- Fixed issue where a prefab added to a `NetworkPrefabsList` while a session was running was registered more than once and logged a duplicate `GlobalObjectIdHash` error. (#4184)
 - Fixed an issue where mixed authority nested `NetworkTransform` instances could stop child/nested instances from updating because an authoritative `NetworkTransform` (root or otherwise) would remove the `NetworkObject` from the update group, preventing non-authoritative instances from updating their state on the authority side. (#4169)
 - Issue where the hybrid mode `NetcodeConfig` validation messages were not interpolated, so they reported placeholders instead of the setting that was wrong. (#4144)
 - Issue where a hybrid mode session failed to start unless `NetcodeConfig.EnableClientServerBootstrap` was set to `DisableAutomaticBootstrap`. Netcode for GameObjects creates the world itself and no longer needs that setting changed. (#4144)
diff --git a/com.unity.netcode.gameobjects/Editor/CodeGen/Unity.Netcode.Editor.CodeGen.asmdef b/com.unity.netcode.gameobjects/Editor/CodeGen/Unity.Netcode.GameObjects.Editor.CodeGen.asmdef
similarity index 100%
rename from com.unity.netcode.gameobjects/Editor/CodeGen/Unity.Netcode.Editor.CodeGen.asmdef
rename to com.unity.netcode.gameobjects/Editor/CodeGen/Unity.Netcode.GameObjects.Editor.CodeGen.asmdef
diff --git a/com.unity.netcode.gameobjects/Editor/CodeGen/Unity.Netcode.Editor.CodeGen.asmdef.meta b/com.unity.netcode.gameobjects/Editor/CodeGen/Unity.Netcode.GameObjects.Editor.CodeGen.asmdef.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Editor/CodeGen/Unity.Netcode.Editor.CodeGen.asmdef.meta
rename to com.unity.netcode.gameobjects/Editor/CodeGen/Unity.Netcode.GameObjects.Editor.CodeGen.asmdef.meta
diff --git a/com.unity.netcode.gameobjects/Editor/PackageChecker/Unity.Netcode.PackageChecker.Editor.asmdef b/com.unity.netcode.gameobjects/Editor/PackageChecker/Unity.Netcode.GameObjects.PackageChecker.Editor.asmdef
similarity index 100%
rename from com.unity.netcode.gameobjects/Editor/PackageChecker/Unity.Netcode.PackageChecker.Editor.asmdef
rename to com.unity.netcode.gameobjects/Editor/PackageChecker/Unity.Netcode.GameObjects.PackageChecker.Editor.asmdef
diff --git a/com.unity.netcode.gameobjects/Editor/PackageChecker/Unity.Netcode.PackageChecker.Editor.asmdef.meta b/com.unity.netcode.gameobjects/Editor/PackageChecker/Unity.Netcode.GameObjects.PackageChecker.Editor.asmdef.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Editor/PackageChecker/Unity.Netcode.PackageChecker.Editor.asmdef.meta
rename to com.unity.netcode.gameobjects/Editor/PackageChecker/Unity.Netcode.GameObjects.PackageChecker.Editor.asmdef.meta
diff --git a/com.unity.netcode.gameobjects/Editor/Unity.Netcode.Editor.asmdef b/com.unity.netcode.gameobjects/Editor/Unity.Netcode.GameObjects.Editor.asmdef
similarity index 100%
rename from com.unity.netcode.gameobjects/Editor/Unity.Netcode.Editor.asmdef
rename to com.unity.netcode.gameobjects/Editor/Unity.Netcode.GameObjects.Editor.asmdef
diff --git a/com.unity.netcode.gameobjects/Editor/Unity.Netcode.Editor.asmdef.meta b/com.unity.netcode.gameobjects/Editor/Unity.Netcode.GameObjects.Editor.asmdef.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Editor/Unity.Netcode.Editor.asmdef.meta
rename to com.unity.netcode.gameobjects/Editor/Unity.Netcode.GameObjects.Editor.asmdef.meta
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Unity.Netcode.Editor.Tests.asmdef b/com.unity.netcode.gameobjects/Tests/Editor/Unity.Netcode.GameObjects.Editor.Tests.asmdef
similarity index 100%
rename from com.unity.netcode.gameobjects/Tests/Editor/Unity.Netcode.Editor.Tests.asmdef
rename to com.unity.netcode.gameobjects/Tests/Editor/Unity.Netcode.GameObjects.Editor.Tests.asmdef
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Unity.Netcode.Editor.Tests.asmdef.meta b/com.unity.netcode.gameobjects/Tests/Editor/Unity.Netcode.GameObjects.Editor.Tests.asmdef.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Tests/Editor/Unity.Netcode.Editor.Tests.asmdef.meta
rename to com.unity.netcode.gameobjects/Tests/Editor/Unity.Netcode.GameObjects.Editor.Tests.asmdef.meta
diff --git a/pvpExceptions.json b/pvpExceptions.json
index e92be2a8a5..9d0d1fbed8 100644
--- a/pvpExceptions.json
+++ b/pvpExceptions.json
@@ -5,18 +5,9 @@
         "CHANGELOG.md: line 9: Unreleased section is not allowed for public release"
       ]
     },
-    "PVP-130-2": {
-      "errors": [
-        "Editor/CodeGen/Unity.Netcode.Editor.CodeGen.asmdef: assembly name does not match filename: Unity.Netcode.GameObjects.Editor.CodeGen",
-        "Editor/PackageChecker/Unity.Netcode.PackageChecker.Editor.asmdef: assembly name does not match filename: Unity.Netcode.GameObjects.PackageChecker.Editor",
-        "Editor/Unity.Netcode.Editor.asmdef: assembly name does not match filename: Unity.Netcode.GameObjects.Editor",
-        "Tests/Editor/Unity.Netcode.Editor.Tests.asmdef: assembly name does not match filename: Unity.Netcode.GameObjects.Editor.Tests"
-      ]
-    },
     "PVP-132-2": {
       "errors": [
-        "Editor/CodeGen/Unity.Netcode.Editor.CodeGen.asmdef: name of editor assembly should end with '.Editor'",
-        "Editor/PackageChecker/Unity.Netcode.PackageChecker.Editor.asmdef: name of editor assembly should end with '.Editor'"
+        "Editor/CodeGen/Unity.Netcode.GameObjects.Editor.CodeGen.asmdef: name of editor assembly should end with '.Editor'"
       ]
     }
   }