diff --git a/README.md b/README.md
index 9b9e005c..fa718f07 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,6 @@
 | `-dump`                 | Write info of loaded assets to the raw folder as they are being loaded. |
 | `-nointro`              | Skip game's cinematic intro.                   |
 | `-version`              | Print IW4x build info on startup.              |
-| `-zonebuilder`          | Start the interactive zonebuilder tool console instead of starting the game. |
 | `-nosteam`              | Disable friends feature and do not update Steam about the game's current status just like an invisible mode. |
 | `-unprotect-dvars`      | Allow the server to modify saved/archive dvars. |
 
diff --git a/src/Components/Modules/Branding.cpp b/src/Components/Modules/Branding.cpp
index c14b7e03..f5e900f6 100644
--- a/src/Components/Modules/Branding.cpp
+++ b/src/Components/Modules/Branding.cpp
@@ -10,9 +10,9 @@ namespace Components
 	Dvar::Var Branding::CGDrawVersionY;
 
 #ifdef _DEBUG
-	constexpr auto* BUILD_TYPE = "IW4x_DEV MP";
+	constexpr auto* BUILD_TYPE = "IW4y_DEV MP";
 #else
-	constexpr auto* BUILD_TYPE = "IW4x MP";
+	constexpr auto* BUILD_TYPE = "IW4y MP";
 #endif
 
 	void Branding::CG_DrawVersion()
@@ -101,7 +101,10 @@ namespace Components
 		RegisterBrandingDvars();
 
 		// UI version string
-		Utils::Hook::Set<const char*>(0x43F73B, "IW4x " REVISION_STR);
+		Utils::Hook::Set<const char*>(0x43F73B, "IW4y " REVISION_STR);
+
+		// Window title
+		Utils::Hook::Set<const char*>(0x5076A0, "IW4y: Multiplayer");
 
 		// Short version dvar
 		Utils::Hook::Set<const char*>(0x60BD91, REVISION_STR);
@@ -138,14 +141,14 @@ namespace Components
 		if (Dedicated::IsEnabled())
 		{
 #ifdef EXPERIMENTAL_BUILD
-			Utils::Hook::Set<const char*>(0x4289E8, "IW4x " REVISION_STR "-develop: Dedicated");
+			Utils::Hook::Set<const char*>(0x4289E8, "IW4y " REVISION_STR "-develop: Dedicated");
 #else
-			Utils::Hook::Set<const char*>(0x4289E8, "IW4x " REVISION_STR ": Dedicated");
+			Utils::Hook::Set<const char*>(0x4289E8, "IW4y " REVISION_STR ": Dedicated");
 #endif
 		}
 		else
 		{
-			Utils::Hook::Set<const char*>(0x4289E8, "IW4x (" REVISION_STR "): Console");
+			Utils::Hook::Set<const char*>(0x4289E8, "IW4y (" REVISION_STR "): Console");
 		}
 	}
 }
diff --git a/src/Components/Modules/Console.cpp b/src/Components/Modules/Console.cpp
index c0f6b5dd..9f061ad4 100644
--- a/src/Components/Modules/Console.cpp
+++ b/src/Components/Modules/Console.cpp
@@ -99,9 +99,9 @@ namespace Components
 		else if (IsWindow(GetWindow()) != FALSE)
 		{
 #ifdef EXPERIMENTAL_BUILD
-			SetWindowTextA(GetWindow(), Utils::String::Format("IW4x " REVISION_STR "-develop : {}", hostname));
+			SetWindowTextA(GetWindow(), Utils::String::Format("IW4y " REVISION_STR "-develop : {}", hostname));
 #else
-			SetWindowTextA(GetWindow(), Utils::String::Format("IW4x " REVISION_STR " : {}", hostname));
+			SetWindowTextA(GetWindow(), Utils::String::Format("IW4y " REVISION_STR " : {}", hostname));
 #endif
 		}
 	}
@@ -862,9 +862,9 @@ namespace Components
 
 		// Console '%s: %s> ' string
 #ifdef EXPERIMENTAL_BUILD
-		Utils::Hook::Set<const char*>(0x5A44B4, "IW4x MP: " REVISION_STR "-develop> ");
+		Utils::Hook::Set<const char*>(0x5A44B4, "IW4y MP: " REVISION_STR "-develop> ");
 #else
-		Utils::Hook::Set<const char*>(0x5A44B4, "IW4x MP: " REVISION_STR "> ");
+		Utils::Hook::Set<const char*>(0x5A44B4, "IW4y MP: " REVISION_STR "> ");
 #endif
 
 		// Patch console color
diff --git a/src/Components/Modules/Localization.cpp b/src/Components/Modules/Localization.cpp
index a76cad20..a5261eeb 100644
--- a/src/Components/Modules/Localization.cpp
+++ b/src/Components/Modules/Localization.cpp
@@ -158,10 +158,11 @@ namespace Components
 		{
 			"NTAuthority",
 			"aerosoul94",
+			"FutureRave",
 			"ReactIW4",
 			"IW4Play",
 			"V2",
-			"luckyy"
+			"luckyy",
 		};
 
 		std::string credits = "^2The IW4x Team:^7\n";
diff --git a/src/Components/Modules/News.cpp b/src/Components/Modules/News.cpp
index 389def85..eff7af5c 100644
--- a/src/Components/Modules/News.cpp
+++ b/src/Components/Modules/News.cpp
@@ -2,7 +2,7 @@
 #include "Changelog.hpp"
 #include "News.hpp"
 
-#define NEWS_MOTD_DEFAULT "Welcome to IW4x Multiplayer!"
+#define NEWS_MOTD_DEFAULT "Welcome to IW4y Multiplayer!"
 
 namespace Components
 {
diff --git a/src/Components/Modules/QuickPatch.cpp b/src/Components/Modules/QuickPatch.cpp
index fb3a1561..69cf95f6 100644
--- a/src/Components/Modules/QuickPatch.cpp
+++ b/src/Components/Modules/QuickPatch.cpp
@@ -339,9 +339,6 @@ namespace Components
 		// fs_basegame
 		Utils::Hook::Set<const char*>(0x6431D1, BASEGAME);
 
-		// window title
-		Utils::Hook::Set<const char*>(0x5076A0, "IW4x: Multiplayer");
-
 		// sv_hostname
 		Utils::Hook::Set<const char*>(0x4D378B, "IW4Host");
 
diff --git a/src/Components/Modules/Singleton.cpp b/src/Components/Modules/Singleton.cpp
index 4eb27bfa..59b09b5a 100644
--- a/src/Components/Modules/Singleton.cpp
+++ b/src/Components/Modules/Singleton.cpp
@@ -17,7 +17,7 @@ namespace Components
 	{
 		if (Flags::HasFlag("version"))
 		{
-			printf("%s", "IW4x " VERSION " (built " __DATE__ " " __TIME__ ")\n");
+			printf("%s", "IW4y " VERSION " (built " __DATE__ " " __TIME__ ")\n");
 #ifdef EXPERIMENTAL_BUILD
 			printf("Revision: %i - develop\n", REVISION);
 #else
diff --git a/src/Steam/Steam.cpp b/src/Steam/Steam.cpp
index 37ec9361..e55b8c1f 100644
--- a/src/Steam/Steam.cpp
+++ b/src/Steam/Steam.cpp
@@ -130,7 +130,7 @@ namespace Steam
 			}
 			else
 			{
-				Proxy::SetMod("IW4x: Modern Warfare 2");
+				Proxy::SetMod("IW4y: Modern Warfare 2");
 				Proxy::RunGame();
 			}
 
diff --git a/src/Utils/Cryptography.hpp b/src/Utils/Cryptography.hpp
index f3b48560..44b35859 100644
--- a/src/Utils/Cryptography.hpp
+++ b/src/Utils/Cryptography.hpp
@@ -30,7 +30,6 @@ namespace Utils
 
 							if (!i)
 							{
-								// Prepend here, as /dev/urandom says so ;) https://github.com/IW4x/iw4x-client-node/wikis/technical-information#incrementing-the-token
 								this->tokenString = std::basic_string<std::uint8_t>(reinterpret_cast<std::uint8_t*>(const_cast<char*>("\0")), 1) + this->tokenString;
 								break;
 							}