diff --git a/src/ObjLoading/Game/IW3/ObjLoaderIW3.cpp b/src/ObjLoading/Game/IW3/ObjLoaderIW3.cpp
index a0e64af7..2ba7ae84 100644
--- a/src/ObjLoading/Game/IW3/ObjLoaderIW3.cpp
+++ b/src/ObjLoading/Game/IW3/ObjLoaderIW3.cpp
@@ -1,7 +1,7 @@
 #include "ObjLoaderIW3.h"
 
 #include "Asset/GlobalAssetPoolsLoader.h"
-#include "Game/IW3/AssetMarkerIW3_pc.h"
+#include "Game/IW3/AssetMarker_iw3_pc.h"
 #include "Game/IW3/Font/FontLoaderIW3.h"
 #include "Game/IW3/GameIW3.h"
 #include "Game/IW3/IW3.h"
diff --git a/src/ObjLoading/Game/IW4/ObjLoaderIW4.cpp b/src/ObjLoading/Game/IW4/ObjLoaderIW4.cpp
index a33a46da..8c391dae 100644
--- a/src/ObjLoading/Game/IW4/ObjLoaderIW4.cpp
+++ b/src/ObjLoading/Game/IW4/ObjLoaderIW4.cpp
@@ -1,7 +1,7 @@
 #include "ObjLoaderIW4.h"
 
 #include "Asset/GlobalAssetPoolsLoader.h"
-#include "Game/IW4/AssetMarkerIW4_pc32.h"
+#include "Game/IW4/AssetMarker_iw4_pc32.h"
 #include "Game/IW4/Font/FontLoaderIW4.h"
 #include "Game/IW4/GameIW4.h"
 #include "Game/IW4/IW4.h"
diff --git a/src/ObjLoading/Game/IW5/ObjLoaderIW5.cpp b/src/ObjLoading/Game/IW5/ObjLoaderIW5.cpp
index 47b1723a..2f6dffa0 100644
--- a/src/ObjLoading/Game/IW5/ObjLoaderIW5.cpp
+++ b/src/ObjLoading/Game/IW5/ObjLoaderIW5.cpp
@@ -1,7 +1,7 @@
 #include "ObjLoaderIW5.h"
 
 #include "Asset/GlobalAssetPoolsLoader.h"
-#include "Game/IW5/AssetMarkerIW5_pc32.h"
+#include "Game/IW5/AssetMarker_iw5_pc32.h"
 #include "Game/IW5/Font/FontLoaderIW5.h"
 #include "Game/IW5/GameIW5.h"
 #include "Game/IW5/IW5.h"
diff --git a/src/ObjLoading/Game/QOS/ObjLoaderQOS.cpp b/src/ObjLoading/Game/QOS/ObjLoaderQOS.cpp
index 9e026b08..c8ec85c0 100644
--- a/src/ObjLoading/Game/QOS/ObjLoaderQOS.cpp
+++ b/src/ObjLoading/Game/QOS/ObjLoaderQOS.cpp
@@ -1,7 +1,7 @@
 #include "ObjLoaderQOS.h"
 
 #include "Asset/GlobalAssetPoolsLoader.h"
-#include "Game/QOS/AssetMarkerQOS_pc.h"
+#include "Game/QOS/AssetMarker_qos_pc.h"
 #include "Game/QOS/QOS.h"
 #include "Localize/AssetLoaderLocalizeQOS.h"
 #include "RawFile/AssetLoaderRawFileQOS.h"
diff --git a/src/ObjLoading/Game/T4/ObjLoaderT4.cpp b/src/ObjLoading/Game/T4/ObjLoaderT4.cpp
index 92474297..670850fa 100644
--- a/src/ObjLoading/Game/T4/ObjLoaderT4.cpp
+++ b/src/ObjLoading/Game/T4/ObjLoaderT4.cpp
@@ -1,7 +1,7 @@
 #include "ObjLoaderT4.h"
 
 #include "Asset/GlobalAssetPoolsLoader.h"
-#include "Game/T4/AssetMarkerT4_pc.h"
+#include "Game/T4/AssetMarker_t4_pc.h"
 #include "Game/T4/Font/FontLoaderT4.h"
 #include "Game/T4/Image/ImageLoaderEmbeddedT4.h"
 #include "Game/T4/Image/ImageLoaderExternalT4.h"
diff --git a/src/ObjLoading/Game/T5/ObjLoaderT5.cpp b/src/ObjLoading/Game/T5/ObjLoaderT5.cpp
index 80c8c266..12f117d9 100644
--- a/src/ObjLoading/Game/T5/ObjLoaderT5.cpp
+++ b/src/ObjLoading/Game/T5/ObjLoaderT5.cpp
@@ -1,7 +1,7 @@
 #include "ObjLoaderT5.h"
 
 #include "Asset/GlobalAssetPoolsLoader.h"
-#include "Game/T5/AssetMarkerT5_pc.h"
+#include "Game/T5/AssetMarker_t5_pc.h"
 #include "Game/T5/Font/FontLoaderT5.h"
 #include "Game/T5/GameT5.h"
 #include "Game/T5/Image/ImageLoaderEmbeddedT5.h"
diff --git a/src/ObjLoading/Game/T6/ObjLoaderT6.cpp b/src/ObjLoading/Game/T6/ObjLoaderT6.cpp
index 44d25582..50835723 100644
--- a/src/ObjLoading/Game/T6/ObjLoaderT6.cpp
+++ b/src/ObjLoading/Game/T6/ObjLoaderT6.cpp
@@ -3,7 +3,7 @@
 #include "Asset/GlobalAssetPoolsLoader.h"
 #include "FontIcon/CsvLoaderFontIconT6.h"
 #include "FontIcon/JsonLoaderFontIconT6.h"
-#include "Game/T6/AssetMarkerT6_pc.h"
+#include "Game/T6/AssetMarker_t6_pc.h"
 #include "Game/T6/CommonT6.h"
 #include "Game/T6/Font/FontLoaderT6.h"
 #include "Game/T6/GameT6.h"
diff --git a/src/ZoneCode.lua b/src/ZoneCode.lua
index 4fa5d916..cc84269e 100644
--- a/src/ZoneCode.lua
+++ b/src/ZoneCode.lua
@@ -335,7 +335,7 @@ function ZoneCode:allMarkFiles()
             end
             
             -- Per variant
-            table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/AssetMarker" .. game .. "_" .. variantLower .. ".h")
+            table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/AssetMarker_" .. gameLower .. "_" .. variantLower .. ".h")
         end
     end
     
@@ -359,7 +359,7 @@ function ZoneCode:allLoadFiles()
             end
             
             -- Per variant
-            table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/AssetLoader" .. game .. "_" .. variantLower .. ".h")
+            table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/AssetLoader_" .. gameLower .. "_" .. variantLower .. ".h")
         end
     end
     
@@ -383,7 +383,7 @@ function ZoneCode:allWriteFiles()
             end
             
             -- Per variant
-            table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/AssetWriter" .. game .. "_" .. variantLower .. ".h")
+            table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/AssetWriter_" .. gameLower .. "_" .. variantLower .. ".h")
         end
     end
     
diff --git a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp
index 079bf302..02f71547 100644
--- a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp
+++ b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp
@@ -169,7 +169,7 @@ namespace
 
             LINEF("#include \"{0}_{1}_{2}_load_db.h\"", Lower(m_env.m_asset->m_definition->m_name), Lower(m_env.m_game), Lower(m_env.m_variant->m_name))
             LINE("")
-            LINEF("#include \"Game/{0}/AssetMarker{0}_{1}.h\"", m_env.m_game, Lower(m_env.m_variant->m_name))
+            LINEF("#include \"Game/{0}/AssetMarker_{0}_{1}.h\"", Lower(m_env.m_game), Lower(m_env.m_variant->m_name))
             LINE("")
             LINE("#include \"Loading/AssetInfoCollector.h\"")
 
@@ -2166,7 +2166,13 @@ std::vector<CodeTemplateFile> ZoneLoadTemplate::GetFilesToRenderOncePerVariant(c
 {
     std::vector<CodeTemplateFile> files;
 
-    files.emplace_back(std::format("AssetLoader{0}_{1}.h", context.m_game, context.m_variant->m_name), TAG_ALL_LOADERS);
+    auto gameName = context.m_game;
+    utils::MakeStringLowerCase(gameName);
+
+    auto variantName = context.m_variant->m_name;
+    utils::MakeStringLowerCase(variantName);
+
+    files.emplace_back(std::format("AssetLoader_{0}_{1}.h", gameName, variantName), TAG_ALL_LOADERS);
 
     return files;
 }
diff --git a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp
index 302c074a..bff28f97 100644
--- a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp
+++ b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp
@@ -795,7 +795,13 @@ std::vector<CodeTemplateFile> ZoneMarkTemplate::GetFilesToRenderOncePerVariant(c
 {
     std::vector<CodeTemplateFile> files;
 
-    files.emplace_back(std::format("AssetMarker{0}_{1}.h", context.m_game, context.m_variant->m_name), TAG_ALL_MARKERS);
+    auto gameName = context.m_game;
+    utils::MakeStringLowerCase(gameName);
+
+    auto variantName = context.m_variant->m_name;
+    utils::MakeStringLowerCase(variantName);
+
+    files.emplace_back(std::format("AssetMarker_{0}_{1}.h", gameName, variantName), TAG_ALL_MARKERS);
 
     return files;
 }
diff --git a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.cpp b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.cpp
index e7f516a3..2282402f 100644
--- a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.cpp
+++ b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.cpp
@@ -1648,7 +1648,13 @@ std::vector<CodeTemplateFile> ZoneWriteTemplate::GetFilesToRenderOncePerVariant(
 {
     std::vector<CodeTemplateFile> files;
 
-    files.emplace_back(std::format("AssetWriter{0}_{1}.h", context.m_game, context.m_variant->m_name), TAG_ALL_WRITERS);
+    auto gameName = context.m_game;
+    utils::MakeStringLowerCase(gameName);
+
+    auto variantName = context.m_variant->m_name;
+    utils::MakeStringLowerCase(variantName);
+
+    files.emplace_back(std::format("AssetWriter_{0}_{1}.h", gameName, variantName), TAG_ALL_WRITERS);
 
     return files;
 }
diff --git a/src/ZoneLoading/Game/IW3/ContentLoaderIW3.cpp b/src/ZoneLoading/Game/IW3/ContentLoaderIW3.cpp
index 331fe40d..061eb4d1 100644
--- a/src/ZoneLoading/Game/IW3/ContentLoaderIW3.cpp
+++ b/src/ZoneLoading/Game/IW3/ContentLoaderIW3.cpp
@@ -1,6 +1,6 @@
 #include "ContentLoaderIW3.h"
 
-#include "Game/IW3/AssetLoaderIW3_pc.h"
+#include "Game/IW3/AssetLoader_iw3_pc.h"
 #include "Game/IW3/IW3.h"
 #include "Loading/Exception/UnsupportedAssetTypeException.h"
 
diff --git a/src/ZoneLoading/Game/IW4/ContentLoaderIW4.cpp b/src/ZoneLoading/Game/IW4/ContentLoaderIW4.cpp
index 83102bb1..ee9ea81b 100644
--- a/src/ZoneLoading/Game/IW4/ContentLoaderIW4.cpp
+++ b/src/ZoneLoading/Game/IW4/ContentLoaderIW4.cpp
@@ -1,6 +1,6 @@
 #include "ContentLoaderIW4.h"
 
-#include "Game/IW4/AssetLoaderIW4_pc32.h"
+#include "Game/IW4/AssetLoader_iw4_pc32.h"
 #include "Game/IW4/IW4.h"
 #include "Loading/Exception/UnsupportedAssetTypeException.h"
 
diff --git a/src/ZoneLoading/Game/IW5/ContentLoaderIW5.cpp b/src/ZoneLoading/Game/IW5/ContentLoaderIW5.cpp
index 22beef5d..0804628b 100644
--- a/src/ZoneLoading/Game/IW5/ContentLoaderIW5.cpp
+++ b/src/ZoneLoading/Game/IW5/ContentLoaderIW5.cpp
@@ -1,6 +1,6 @@
 #include "ContentLoaderIW5.h"
 
-#include "Game/IW5/AssetLoaderIW5_pc32.h"
+#include "Game/IW5/AssetLoader_iw5_pc32.h"
 #include "Game/IW5/IW5.h"
 #include "Loading/Exception/UnsupportedAssetTypeException.h"
 
diff --git a/src/ZoneLoading/Game/QOS/ContentLoaderQOS.cpp b/src/ZoneLoading/Game/QOS/ContentLoaderQOS.cpp
index de27aaf5..99a9e19f 100644
--- a/src/ZoneLoading/Game/QOS/ContentLoaderQOS.cpp
+++ b/src/ZoneLoading/Game/QOS/ContentLoaderQOS.cpp
@@ -1,6 +1,6 @@
 #include "ContentLoaderQOS.h"
 
-#include "Game/QOS/AssetLoaderQOS_pc.h"
+#include "Game/QOS/AssetLoader_qos_pc.h"
 #include "Loading/Exception/UnsupportedAssetTypeException.h"
 
 #include <cassert>
diff --git a/src/ZoneLoading/Game/T4/ContentLoaderT4.cpp b/src/ZoneLoading/Game/T4/ContentLoaderT4.cpp
index c47dc610..16624d2f 100644
--- a/src/ZoneLoading/Game/T4/ContentLoaderT4.cpp
+++ b/src/ZoneLoading/Game/T4/ContentLoaderT4.cpp
@@ -1,6 +1,6 @@
 #include "ContentLoaderT4.h"
 
-#include "Game/T4/AssetLoaderT4_pc.h"
+#include "Game/T4/AssetLoader_t4_pc.h"
 #include "Game/T4/T4.h"
 #include "Loading/Exception/UnsupportedAssetTypeException.h"
 
diff --git a/src/ZoneLoading/Game/T5/ContentLoaderT5.cpp b/src/ZoneLoading/Game/T5/ContentLoaderT5.cpp
index b90ccef2..7fbb041a 100644
--- a/src/ZoneLoading/Game/T5/ContentLoaderT5.cpp
+++ b/src/ZoneLoading/Game/T5/ContentLoaderT5.cpp
@@ -1,6 +1,6 @@
 #include "ContentLoaderT5.h"
 
-#include "Game/T5/AssetLoaderT5_pc.h"
+#include "Game/T5/AssetLoader_t5_pc.h"
 #include "Game/T5/T5.h"
 #include "Loading/Exception/UnsupportedAssetTypeException.h"
 
diff --git a/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp b/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp
index 08b2d17d..4e571b14 100644
--- a/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp
+++ b/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp
@@ -1,6 +1,6 @@
 #include "ContentLoaderT6.h"
 
-#include "Game/T6/AssetLoaderT6_pc.h"
+#include "Game/T6/AssetLoader_t6_pc.h"
 #include "Game/T6/T6.h"
 #include "Loading/Exception/UnsupportedAssetTypeException.h"
 
diff --git a/src/ZoneWriting/Game/IW3/ContentWriterIW3.cpp b/src/ZoneWriting/Game/IW3/ContentWriterIW3.cpp
index 34ca80a7..d46da9ad 100644
--- a/src/ZoneWriting/Game/IW3/ContentWriterIW3.cpp
+++ b/src/ZoneWriting/Game/IW3/ContentWriterIW3.cpp
@@ -1,6 +1,6 @@
 #include "ContentWriterIW3.h"
 
-#include "Game/IW3/AssetWriterIW3_pc.h"
+#include "Game/IW3/AssetWriter_iw3_pc.h"
 #include "Writing/WritingException.h"
 
 #include <cassert>
diff --git a/src/ZoneWriting/Game/IW4/ContentWriterIW4.cpp b/src/ZoneWriting/Game/IW4/ContentWriterIW4.cpp
index 7f9b6efd..fa744520 100644
--- a/src/ZoneWriting/Game/IW4/ContentWriterIW4.cpp
+++ b/src/ZoneWriting/Game/IW4/ContentWriterIW4.cpp
@@ -1,6 +1,6 @@
 #include "ContentWriterIW4.h"
 
-#include "Game/IW4/AssetWriterIW4_pc32.h"
+#include "Game/IW4/AssetWriter_iw4_pc32.h"
 #include "Writing/WritingException.h"
 
 #include <cassert>
diff --git a/src/ZoneWriting/Game/IW5/ContentWriterIW5.cpp b/src/ZoneWriting/Game/IW5/ContentWriterIW5.cpp
index 167fe906..61b24278 100644
--- a/src/ZoneWriting/Game/IW5/ContentWriterIW5.cpp
+++ b/src/ZoneWriting/Game/IW5/ContentWriterIW5.cpp
@@ -1,6 +1,6 @@
 #include "ContentWriterIW5.h"
 
-#include "Game/IW5/AssetWriterIW5_pc32.h"
+#include "Game/IW5/AssetWriter_iw5_pc32.h"
 #include "Writing/WritingException.h"
 
 #include <cassert>
diff --git a/src/ZoneWriting/Game/QOS/ContentWriterQOS.cpp b/src/ZoneWriting/Game/QOS/ContentWriterQOS.cpp
index 0f408257..b2c2fdd1 100644
--- a/src/ZoneWriting/Game/QOS/ContentWriterQOS.cpp
+++ b/src/ZoneWriting/Game/QOS/ContentWriterQOS.cpp
@@ -1,6 +1,6 @@
 #include "ContentWriterQOS.h"
 
-#include "Game/QOS/AssetWriterQOS_pc.h"
+#include "Game/QOS/AssetWriter_qos_pc.h"
 #include "Writing/WritingException.h"
 
 #include <cassert>
diff --git a/src/ZoneWriting/Game/T4/ContentWriterT4.cpp b/src/ZoneWriting/Game/T4/ContentWriterT4.cpp
index 2538b487..a903942e 100644
--- a/src/ZoneWriting/Game/T4/ContentWriterT4.cpp
+++ b/src/ZoneWriting/Game/T4/ContentWriterT4.cpp
@@ -1,6 +1,6 @@
 #include "ContentWriterT4.h"
 
-#include "Game/T4/AssetWriterT4_pc.h"
+#include "Game/T4/AssetWriter_t4_pc.h"
 #include "Writing/WritingException.h"
 
 #include <cassert>
diff --git a/src/ZoneWriting/Game/T5/ContentWriterT5.cpp b/src/ZoneWriting/Game/T5/ContentWriterT5.cpp
index cc06b891..dcbf82b9 100644
--- a/src/ZoneWriting/Game/T5/ContentWriterT5.cpp
+++ b/src/ZoneWriting/Game/T5/ContentWriterT5.cpp
@@ -1,6 +1,6 @@
 #include "ContentWriterT5.h"
 
-#include "Game/T5/AssetWriterT5_pc.h"
+#include "Game/T5/AssetWriter_t5_pc.h"
 #include "Writing/WritingException.h"
 
 #include <cassert>
diff --git a/src/ZoneWriting/Game/T6/ContentWriterT6.cpp b/src/ZoneWriting/Game/T6/ContentWriterT6.cpp
index 5510d576..dbd4e0f6 100644
--- a/src/ZoneWriting/Game/T6/ContentWriterT6.cpp
+++ b/src/ZoneWriting/Game/T6/ContentWriterT6.cpp
@@ -1,6 +1,6 @@
 #include "ContentWriterT6.h"
 
-#include "Game/T6/AssetWriterT6_pc.h"
+#include "Game/T6/AssetWriter_t6_pc.h"
 #include "Writing/WritingException.h"
 
 #include <cassert>