diff --git a/Client.Tests/Core/Encryption/AES.Tests.cs b/Client.Tests/Core/Encryption/AES.Tests.cs
index 44a17130..87c21dc6 100644
--- a/Client.Tests/Core/Encryption/AES.Tests.cs
+++ b/Client.Tests/Core/Encryption/AES.Tests.cs
@@ -1,6 +1,6 @@
 using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using xClient.Core.Encryption;
+using xClient.Core.Cryptography;
 using xClient.Core.Helper;
 
 namespace xClient.Tests.Core.Encryption
diff --git a/Client.Tests/Core/Encryption/SHA256.Tests.cs b/Client.Tests/Core/Encryption/SHA256.Tests.cs
index 02748a78..3f20d87a 100644
--- a/Client.Tests/Core/Encryption/SHA256.Tests.cs
+++ b/Client.Tests/Core/Encryption/SHA256.Tests.cs
@@ -1,5 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using xClient.Core.Encryption;
+using xClient.Core.Cryptography;
 using xClient.Core.Helper;
 
 namespace xClient.Tests.Core.Encryption
diff --git a/Client/Client.csproj b/Client/Client.csproj
index 7f58f1d8..c9227c3d 100644
--- a/Client/Client.csproj
+++ b/Client/Client.csproj
@@ -88,8 +88,8 @@
     <Compile Include="Core\Commands\SurveillanceHandler.cs" />
     <Compile Include="Core\Commands\SystemHandler.cs" />
     <Compile Include="Core\Compression\SafeQuickLZ.cs" />
-    <Compile Include="Core\Encryption\AES.cs" />
-    <Compile Include="Core\Encryption\SHA256.cs" />
+    <Compile Include="Core\Cryptography\AES.cs" />
+    <Compile Include="Core\Cryptography\SHA256.cs" />
     <Compile Include="Core\Extensions\RegistryKeyExtensions.cs" />
     <Compile Include="Core\Packets\ClientPackets\GetPasswordsResponse.cs" />
     <Compile Include="Core\Packets\ClientPackets\SetStatusFileManager.cs" />
diff --git a/Client/Core/Encryption/AES.cs b/Client/Core/Cryptography/AES.cs
similarity index 99%
rename from Client/Core/Encryption/AES.cs
rename to Client/Core/Cryptography/AES.cs
index 9b28d0de..01246db7 100644
--- a/Client/Core/Encryption/AES.cs
+++ b/Client/Core/Cryptography/AES.cs
@@ -3,7 +3,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace xClient.Core.Encryption
+namespace xClient.Core.Cryptography
 {
     public static class AES
     {
diff --git a/Client/Core/Encryption/SHA256.cs b/Client/Core/Cryptography/SHA256.cs
similarity index 94%
rename from Client/Core/Encryption/SHA256.cs
rename to Client/Core/Cryptography/SHA256.cs
index 6824c94b..ccb8ad0c 100644
--- a/Client/Core/Encryption/SHA256.cs
+++ b/Client/Core/Cryptography/SHA256.cs
@@ -1,7 +1,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace xClient.Core.Encryption
+namespace xClient.Core.Cryptography
 {
     public static class SHA256
     {
diff --git a/Client/Core/Helper/DevicesHelper.cs b/Client/Core/Helper/DevicesHelper.cs
index 2d5c5c8d..58b19421 100644
--- a/Client/Core/Helper/DevicesHelper.cs
+++ b/Client/Core/Helper/DevicesHelper.cs
@@ -2,7 +2,7 @@
 using System.Management;
 using System.Net.NetworkInformation;
 using System.Net.Sockets;
-using xClient.Core.Encryption;
+using xClient.Core.Cryptography;
 
 namespace xClient.Core.Helper
 {
diff --git a/Client/Core/Networking/Client.cs b/Client/Core/Networking/Client.cs
index 15dc4e8a..307cbfe9 100644
--- a/Client/Core/Networking/Client.cs
+++ b/Client/Core/Networking/Client.cs
@@ -5,7 +5,7 @@
 using System.Net.Sockets;
 using System.Threading;
 using xClient.Core.Compression;
-using xClient.Core.Encryption;
+using xClient.Core.Cryptography;
 using xClient.Core.Extensions;
 using xClient.Core.NetSerializer;
 using xClient.Core.Packets;
diff --git a/Client/Program.cs b/Client/Program.cs
index d1ed77a8..caf854f9 100644
--- a/Client/Program.cs
+++ b/Client/Program.cs
@@ -5,8 +5,8 @@
 using System.Windows.Forms;
 using xClient.Config;
 using xClient.Core.Commands;
+using xClient.Core.Cryptography;
 using xClient.Core.Data;
-using xClient.Core.Encryption;
 using xClient.Core.Helper;
 using xClient.Core.Installation;
 using xClient.Core.Networking;
diff --git a/Server.Tests/Core/Encryption/AES.Tests.cs b/Server.Tests/Core/Encryption/AES.Tests.cs
index c207c1c1..f9fcd3ef 100644
--- a/Server.Tests/Core/Encryption/AES.Tests.cs
+++ b/Server.Tests/Core/Encryption/AES.Tests.cs
@@ -1,6 +1,6 @@
 using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using xServer.Core.Encryption;
+using xServer.Core.Cryptography;
 using xServer.Core.Helper;
 
 namespace xServer.Tests.Core.Encryption
diff --git a/Server/Core/Build/ClientBuilder.cs b/Server/Core/Build/ClientBuilder.cs
index 7f30909e..9afabdeb 100644
--- a/Server/Core/Build/ClientBuilder.cs
+++ b/Server/Core/Build/ClientBuilder.cs
@@ -3,7 +3,7 @@
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using Vestris.ResourceLib;
-using xServer.Core.Encryption;
+using xServer.Core.Cryptography;
 using xServer.Core.Helper;
 
 namespace xServer.Core.Build
diff --git a/Server/Core/Build/Renamer.cs b/Server/Core/Build/Renamer.cs
index e416af48..97e272b4 100644
--- a/Server/Core/Build/Renamer.cs
+++ b/Server/Core/Build/Renamer.cs
@@ -56,14 +56,13 @@ public bool Perform()
 
         private void RenameInType(TypeDefinition typeDef)
         {
-            if (typeDef.Namespace.StartsWith("xClient.Core.Elevation")
-                || typeDef.Namespace.StartsWith("xClient.Core.Compression")
+            if (typeDef.Namespace.StartsWith("xClient.Core.Compression")
                 || typeDef.Namespace.StartsWith("xClient.Core.Networking")
                 || typeDef.Namespace.StartsWith("xClient.Core.NetSerializer")
                 || typeDef.Namespace.StartsWith("xClient.Core.ReverseProxy")
                 || typeDef.Namespace.StartsWith("xClient.Core.MouseKeyHook")
                 || typeDef.Namespace.StartsWith("xClient.Core.Packets")
-                || typeDef.Namespace.StartsWith("xClient.Core.Recovery.Browsers")
+                || typeDef.Namespace.StartsWith("xClient.Core.Recovery")
                 || typeDef.HasInterfaces)
                 return;
 
diff --git a/Server/Core/Encryption/AES.cs b/Server/Core/Cryptography/AES.cs
similarity index 99%
rename from Server/Core/Encryption/AES.cs
rename to Server/Core/Cryptography/AES.cs
index 492e8567..db0e138b 100644
--- a/Server/Core/Encryption/AES.cs
+++ b/Server/Core/Cryptography/AES.cs
@@ -3,7 +3,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace xServer.Core.Encryption
+namespace xServer.Core.Cryptography
 {
     public static class AES
     {
diff --git a/Server/Core/Networking/Client.cs b/Server/Core/Networking/Client.cs
index 08570040..dc78d79a 100644
--- a/Server/Core/Networking/Client.cs
+++ b/Server/Core/Networking/Client.cs
@@ -5,7 +5,7 @@
 using System.Net.Sockets;
 using System.Threading;
 using xServer.Core.Compression;
-using xServer.Core.Encryption;
+using xServer.Core.Cryptography;
 using xServer.Core.Extensions;
 using xServer.Core.NetSerializer;
 using xServer.Core.Packets;
diff --git a/Server/Forms/FrmMain.cs b/Server/Forms/FrmMain.cs
index 0ed7195d..77d17e2b 100644
--- a/Server/Forms/FrmMain.cs
+++ b/Server/Forms/FrmMain.cs
@@ -5,8 +5,8 @@
 using System.Threading;
 using System.Windows.Forms;
 using xServer.Core.Commands;
+using xServer.Core.Cryptography;
 using xServer.Core.Data;
-using xServer.Core.Encryption;
 using xServer.Enums;
 using xServer.Core.Helper;
 using xServer.Core.Networking;
diff --git a/Server/Forms/FrmSettings.cs b/Server/Forms/FrmSettings.cs
index f1fdd6c9..eb0702f5 100644
--- a/Server/Forms/FrmSettings.cs
+++ b/Server/Forms/FrmSettings.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Globalization;
 using System.Windows.Forms;
+using xServer.Core.Cryptography;
 using xServer.Core.Data;
-using xServer.Core.Encryption;
 using xServer.Core.Networking;
 using xServer.Core.Networking.Utilities;
 using xServer.Core.Utilities;
diff --git a/Server/Server.csproj b/Server/Server.csproj
index ad5289e7..c12d7697 100644
--- a/Server/Server.csproj
+++ b/Server/Server.csproj
@@ -158,7 +158,7 @@
     <Compile Include="Core\Commands\SurveillanceHandler.cs" />
     <Compile Include="Core\Commands\SystemHandler.cs" />
     <Compile Include="Core\Compression\SafeQuickLZ.cs" />
-    <Compile Include="Core\Encryption\AES.cs" />
+    <Compile Include="Core\Cryptography\AES.cs" />
     <Compile Include="Core\Utilities\FileSplit.cs" />
     <Compile Include="Core\Utilities\UnsafeStreamCodec.cs" />
     <Compile Include="Core\Networking\Utilities\UPnP.cs" />