diff --git a/Assets/Mirror/Tests/Editor/NetworkReaderWriter/NetworkWriterCollectionTest.cs b/Assets/Mirror/Tests/Editor/NetworkReaderWriter/NetworkWriterCollectionTest.cs
index 93d6ce211..c3cd2cf48 100644
--- a/Assets/Mirror/Tests/Editor/NetworkReaderWriter/NetworkWriterCollectionTest.cs
+++ b/Assets/Mirror/Tests/Editor/NetworkReaderWriter/NetworkWriterCollectionTest.cs
@@ -1,5 +1,5 @@
 using System;
-using Mirror.Tests.RemoteAttrributeTest;
+using Rpcs;
 using NUnit.Framework;
 
 namespace Mirror.Tests
diff --git a/Assets/Mirror/Tests/Editor/NetworkReaderWriter/NetworkWriterTest.cs b/Assets/Mirror/Tests/Editor/NetworkReaderWriter/NetworkWriterTest.cs
index 52eed3a4e..6ee444c0e 100644
--- a/Assets/Mirror/Tests/Editor/NetworkReaderWriter/NetworkWriterTest.cs
+++ b/Assets/Mirror/Tests/Editor/NetworkReaderWriter/NetworkWriterTest.cs
@@ -3,7 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
-using Mirror.Tests.RemoteAttrributeTest;
+using Rpcs;
 using NUnit.Framework;
 using UnityEngine;
 using UnityEngine.TestTools;
diff --git a/Assets/Mirror/Tests/Editor/Rpcs/ClientRpcOverrideTest.cs b/Assets/Mirror/Tests/Editor/Rpcs/ClientRpcOverrideTest.cs
index e6099bec5..30ec8960f 100644
--- a/Assets/Mirror/Tests/Editor/Rpcs/ClientRpcOverrideTest.cs
+++ b/Assets/Mirror/Tests/Editor/Rpcs/ClientRpcOverrideTest.cs
@@ -1,7 +1,9 @@
 using System;
+using Mirror;
+using Mirror.Tests;
 using NUnit.Framework;
 
-namespace Mirror.Tests.RemoteAttrributeTest
+namespace Rpcs
 {
     class VirtualClientRpc : NetworkBehaviour
     {
diff --git a/Assets/Mirror/Tests/Editor/Rpcs/ClientRpcTest.cs b/Assets/Mirror/Tests/Editor/Rpcs/ClientRpcTest.cs
index 4c5c6f3ce..8dbd3eee0 100644
--- a/Assets/Mirror/Tests/Editor/Rpcs/ClientRpcTest.cs
+++ b/Assets/Mirror/Tests/Editor/Rpcs/ClientRpcTest.cs
@@ -1,7 +1,9 @@
 using System;
+using Mirror;
+using Mirror.Tests;
 using NUnit.Framework;
 
-namespace Mirror.Tests.RemoteAttrributeTest
+namespace Rpcs
 {
     class ClientRpcBehaviour : NetworkBehaviour
     {
diff --git a/Assets/Mirror/Tests/Editor/Rpcs/CommandOverrideTest.cs b/Assets/Mirror/Tests/Editor/Rpcs/CommandOverrideTest.cs
index ec6c6d717..27f41e3ad 100644
--- a/Assets/Mirror/Tests/Editor/Rpcs/CommandOverrideTest.cs
+++ b/Assets/Mirror/Tests/Editor/Rpcs/CommandOverrideTest.cs
@@ -1,7 +1,9 @@
 using System;
+using Mirror;
+using Mirror.Tests;
 using NUnit.Framework;
 
-namespace Mirror.Tests.RemoteAttrributeTest
+namespace Rpcs
 {
     class VirtualCommand : NetworkBehaviour
     {
diff --git a/Assets/Mirror/Tests/Editor/Rpcs/CommandTest.cs b/Assets/Mirror/Tests/Editor/Rpcs/CommandTest.cs
index b0c136b36..83d8b6254 100644
--- a/Assets/Mirror/Tests/Editor/Rpcs/CommandTest.cs
+++ b/Assets/Mirror/Tests/Editor/Rpcs/CommandTest.cs
@@ -1,10 +1,12 @@
 using System;
 using System.Text.RegularExpressions;
+using Mirror;
+using Mirror.Tests;
 using NUnit.Framework;
 using UnityEngine;
 using UnityEngine.TestTools;
 
-namespace Mirror.Tests.RemoteAttrributeTest
+namespace Rpcs
 {
     class AuthorityBehaviour : NetworkBehaviour
     {
diff --git a/Assets/Mirror/Tests/Editor/Rpcs/RpcNetworkIdentityTest.cs b/Assets/Mirror/Tests/Editor/Rpcs/RpcNetworkIdentityTest.cs
index ca054f87b..32421b52c 100644
--- a/Assets/Mirror/Tests/Editor/Rpcs/RpcNetworkIdentityTest.cs
+++ b/Assets/Mirror/Tests/Editor/Rpcs/RpcNetworkIdentityTest.cs
@@ -1,8 +1,10 @@
 using System;
+using Mirror;
+using Mirror.Tests;
 using NUnit.Framework;
 using UnityEngine;
 
-namespace Mirror.Tests.RemoteAttrributeTest
+namespace Rpcs
 {
     class RpcNetworkIdentityBehaviour : NetworkBehaviour
     {
diff --git a/Assets/Mirror/Tests/Editor/Rpcs/TargetRpcOverrideTest.cs b/Assets/Mirror/Tests/Editor/Rpcs/TargetRpcOverrideTest.cs
index da9e5abcb..6802b129d 100644
--- a/Assets/Mirror/Tests/Editor/Rpcs/TargetRpcOverrideTest.cs
+++ b/Assets/Mirror/Tests/Editor/Rpcs/TargetRpcOverrideTest.cs
@@ -1,7 +1,9 @@
 using System;
+using Mirror;
+using Mirror.Tests;
 using NUnit.Framework;
 
-namespace Mirror.Tests.RemoteAttrributeTest
+namespace Rpcs
 {
     class VirtualTargetRpc : NetworkBehaviour
     {
diff --git a/Assets/Mirror/Tests/Editor/Rpcs/TargetRpcTest.cs b/Assets/Mirror/Tests/Editor/Rpcs/TargetRpcTest.cs
index b2ec205e8..b49abc531 100644
--- a/Assets/Mirror/Tests/Editor/Rpcs/TargetRpcTest.cs
+++ b/Assets/Mirror/Tests/Editor/Rpcs/TargetRpcTest.cs
@@ -1,10 +1,12 @@
 using System;
 using System.Text.RegularExpressions;
+using Mirror;
+using Mirror.Tests;
 using NUnit.Framework;
 using UnityEngine;
 using UnityEngine.TestTools;
 
-namespace Mirror.Tests.RemoteAttrributeTest
+namespace Rpcs
 {
     class TargetRpcBehaviour : NetworkBehaviour
     {