diff --git a/src/ZoneCodeGeneratorLib/Generating/Templates/AssetStructTestsTemplate.cpp b/src/ZoneCodeGeneratorLib/Generating/Templates/AssetStructTestsTemplate.cpp
index 7461e085..973a5e35 100644
--- a/src/ZoneCodeGeneratorLib/Generating/Templates/AssetStructTestsTemplate.cpp
+++ b/src/ZoneCodeGeneratorLib/Generating/Templates/AssetStructTestsTemplate.cpp
@@ -32,7 +32,7 @@ namespace
             LINE("")
             LINEF("using namespace {0};", m_env.m_game)
             LINE("")
-            LINEF("namespace game::{0}::xassets::asset_{1}", m_env.m_game, Lower(m_env.m_asset->m_definition->m_name))
+            LINEF("namespace game::{0}::{1}::xassets::asset_{1}", m_env.m_game, m_env.m_variant->m_name, Lower(m_env.m_asset->m_definition->m_name))
             LINE("{")
             m_intendation++;
 
diff --git a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp
index 18d0c343..474494f7 100644
--- a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp
+++ b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp
@@ -256,9 +256,9 @@ namespace
             SINGLE_POINTER
         };
 
-        static std::string LoaderClassName(const StructureInformation* asset)
+        std::string LoaderClassName(const StructureInformation* asset) const
         {
-            return std::format("Loader_{0}", asset->m_definition->m_name);
+            return std::format("Loader_{0}_{1}", asset->m_definition->m_name, m_env.m_variant->m_name);
         }
 
         static std::string VariableDecl(const DataDefinition* def)
diff --git a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp
index d1b0ee39..423032c8 100644
--- a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp
+++ b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp
@@ -204,9 +204,9 @@ namespace
             SINGLE_POINTER
         };
 
-        static std::string MarkerClassName(const StructureInformation* asset)
+        std::string MarkerClassName(const StructureInformation* asset) const
         {
-            return std::format("Marker_{0}", asset->m_definition->m_name);
+            return std::format("Marker_{0}_{1}", asset->m_definition->m_name, m_env.m_variant->m_name);
         }
 
         static std::string VariableDecl(const DataDefinition* def)
diff --git a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.cpp b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.cpp
index 51c72f1d..dd7fbaa6 100644
--- a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.cpp
+++ b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.cpp
@@ -234,9 +234,9 @@ namespace
             SINGLE_POINTER
         };
 
-        static std::string WriterClassName(const StructureInformation* asset)
+        std::string WriterClassName(const StructureInformation* asset) const
         {
-            return std::format("Writer_{0}", asset->m_definition->m_name);
+            return std::format("Writer_{0}_{1}", asset->m_definition->m_name, m_env.m_variant->m_name);
         }
 
         static std::string VariableDecl(const DataDefinition* def)