diff --git a/premake5.lua b/premake5.lua
index 9dc8e487..6c280691 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -251,9 +251,9 @@ warnings "Extra"
 characterset "ASCII"
 
 if _OPTIONS["dev-build"] then
-	defines {"DEV_BUILD", 'BUILD_NAME="IW7_DEV"'}
+	defines {"DEV_BUILD", 'BUILD_NAME="S2_DEV"'}
 else
-	defines {'BUILD_NAME="IW7"'}
+	defines {'BUILD_NAME="S2"'}
 end
 
 if _OPTIONS["steam-overlay"] then
@@ -320,17 +320,11 @@ links {"common"}
 prebuildcommands {"pushd %{_MAIN_SCRIPT_DIR}", "tools\\premake5 generate-buildinfo", "popd"}
 
 local COMPUTER_NAME = os.getenv('COMPUTERNAME')
-if COMPUTER_NAME == "JOEL-PC" then
-	debugdir "D:\\Games\\PC\\IW7"
-	debugcommand "D:\\Games\\PC\\IW7\\$(TargetName)$(TargetExt)"
+if COMPUTER_NAME == "PC" then
+	debugdir "D:\\Games\\Call of Duty WWII"
+	debugcommand "D:\\Games\\Call of Duty WWII\\$(TargetName)$(TargetExt)"
 	postbuildcommands {
-		"copy /y \"$(OutDir)$(TargetName)$(TargetExt)\" \"D:\\Games\\PC\\IW7\\$(TargetName)$(TargetExt)\"",
-	}
-elseif COMPUTER_NAME == "DESKTOP-P7PCR6I" or COMPUTER_NAME == "mikey" then
-	debugdir "C:\\Program Files (x86)\\Steam\\steamapps\\common\\Call of Duty - Infinite Warfare"
-	debugcommand "C:\\Program Files (x86)\\Steam\\steamapps\\common\\Call of Duty - Infinite Warfare\\$(TargetName)$(TargetExt)"
-	postbuildcommands {
-		"copy /y \"$(OutDir)$(TargetName)$(TargetExt)\" \"C:\\Program Files (x86)\\Steam\\steamapps\\common\\Call of Duty - Infinite Warfare\\$(TargetName)$(TargetExt)\"",
+		"copy /y \"$(OutDir)$(TargetName)$(TargetExt)\" \"D:\\Games\\Call of Duty WWII\\$(TargetName)$(TargetExt)\"",
 	}
 end
 
diff --git a/src/client/component/uwp/uwp.cpp b/src/client/component/uwp/uwp.cpp
index ab0c0141..4013ca12 100644
--- a/src/client/component/uwp/uwp.cpp
+++ b/src/client/component/uwp/uwp.cpp
@@ -1 +1 @@
-//
\ No newline at end of file
+#include <std_include.hpp>
\ No newline at end of file
diff --git a/src/client/game/game.cpp b/src/client/game/game.cpp
index 8117eeae..5921c774 100644
--- a/src/client/game/game.cpp
+++ b/src/client/game/game.cpp
@@ -2,8 +2,6 @@
 #include "game.hpp"
 #include "dvars.hpp"
 
-#include "component/console/console.hpp"
-
 #include <utils/flags.hpp>
 #include <utils/string.hpp>
 #include <utils/io.hpp>
diff --git a/src/client/loader/tls.cpp b/src/client/loader/tls.cpp
index f2f2c4f0..16b84806 100644
--- a/src/client/loader/tls.cpp
+++ b/src/client/loader/tls.cpp
@@ -8,7 +8,7 @@ namespace tls
 {
 	namespace
 	{
-		utils::binary_resource tls_dll_file(TLS_DLL, "iw7-tlsdll.dll");
+		utils::binary_resource tls_dll_file(TLS_DLL, "s2-tlsdll.dll");
 	}
 
 	PIMAGE_TLS_DIRECTORY allocate_tls_index()
diff --git a/src/client/resource.rc b/src/client/resource.rc
index e657525c..c9b73cfe 100644
--- a/src/client/resource.rc
+++ b/src/client/resource.rc
@@ -70,15 +70,15 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "XLabs"
-            VALUE "FileDescription", "IW7-Mod"
+            VALUE "CompanyName", "Skkuull"
+            VALUE "FileDescription", "S2-Mod"
             VALUE "FileVersion", VERSION_FILE
-            VALUE "InternalName", "IW7-Mod"
-            VALUE "LegalCopyright", "Copyright (C) 2022 X Labs Project. All rights reserved."
+            VALUE "InternalName", "S2-Mod"
+            VALUE "LegalCopyright", "Copyright (C) 2022 skkuull. All rights reserved."
             VALUE "Licence", "GPLv3"
-            VALUE "Info", "https://github.com/Joelrau/iw7-mod/"
-            VALUE "OriginalFilename", "iw7-mod.exe"
-            VALUE "ProductName", "iw7-mod"
+            VALUE "Info", "https://github.com/skkuull/s2-mod/"
+            VALUE "OriginalFilename", "s2-mod.exe"
+            VALUE "ProductName", "s2-mod"
             VALUE "ProductVersion", VERSION_PRODUCT
         END
     END
diff --git a/src/client/utils/hash.cpp b/src/client/utils/hash.cpp
index 2f94b5bf..82650561 100644
--- a/src/client/utils/hash.cpp
+++ b/src/client/utils/hash.cpp
@@ -3,7 +3,6 @@
 #include "game/game.hpp"
 
 #include "hash.hpp"
-#include "component/console/console.hpp"
 
 #include <zlib.h>
 #include <utils/cryptography.hpp>
diff --git a/src/common/exception/minidump.cpp b/src/common/exception/minidump.cpp
index 9ce80f31..492c7771 100644
--- a/src/common/exception/minidump.cpp
+++ b/src/common/exception/minidump.cpp
@@ -28,7 +28,7 @@ namespace exception
 			char pathname[MAX_PATH] = {0};
 
 			GetTempPathA(sizeof(pathname), pathname);
-			GetTempFileNameA(pathname, "IW7-", 0, filename);
+			GetTempFileNameA(pathname, "S2-", 0, filename);
 			return filename;
 		}
 
diff --git a/src/common/utils/image.hpp b/src/common/utils/image.hpp
index a617df76..dfa8ba61 100644
--- a/src/common/utils/image.hpp
+++ b/src/common/utils/image.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string>
+#include <stdexcept>
 
 namespace utils
 {
diff --git a/src/common/utils/properties.cpp b/src/common/utils/properties.cpp
index 8e5dd299..d7172847 100644
--- a/src/common/utils/properties.cpp
+++ b/src/common/utils/properties.cpp
@@ -18,7 +18,7 @@ namespace utils::properties
 				CoTaskMemFree(path);
 			});
 
-		static auto appdata = std::filesystem::path(path) / "auroramod/iw7-mod";
+		static auto appdata = std::filesystem::path(path) / "s2-mod";
 		return appdata;
 	}
 }