diff --git a/src/ObjLoading/Game/T6/CustomMap/LoaderCustomMapT6.cpp b/src/ObjLoading/Game/T6/CustomMap/LoaderCustomMapT6.cpp
index 29983f78..75f86c03 100644
--- a/src/ObjLoading/Game/T6/CustomMap/LoaderCustomMapT6.cpp
+++ b/src/ObjLoading/Game/T6/CustomMap/LoaderCustomMapT6.cpp
@@ -53,10 +53,10 @@ namespace
     };
 } // namespace
 
-namespace T6
+namespace custom_map
 {
-    std::unique_ptr<AssetCreator<AssetGfxWorld>> CreateCustomMapLoader(MemoryManager& memory, ISearchPath& searchPath, Zone& zone)
+    std::unique_ptr<AssetCreator<AssetGfxWorld>> CreateLoaderT6(MemoryManager& memory, ISearchPath& searchPath, Zone& zone)
     {
         return std::make_unique<CustomMapLoader>(memory, searchPath, zone);
     }
-} // namespace T6
+} // namespace custom_map
diff --git a/src/ObjLoading/Game/T6/CustomMap/LoaderCustomMapT6.h b/src/ObjLoading/Game/T6/CustomMap/LoaderCustomMapT6.h
index 78a388fc..5cf0e007 100644
--- a/src/ObjLoading/Game/T6/CustomMap/LoaderCustomMapT6.h
+++ b/src/ObjLoading/Game/T6/CustomMap/LoaderCustomMapT6.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-namespace T6
+namespace custom_map
 {
-    std::unique_ptr<AssetCreator<AssetGfxWorld>> CreateCustomMapLoader(MemoryManager& memory, ISearchPath& searchPath, Zone& zone);
-} // namespace T6
+    std::unique_ptr<AssetCreator<T6::AssetGfxWorld>> CreateLoaderT6(MemoryManager& memory, ISearchPath& searchPath, Zone& zone);
+} // namespace custom_map
diff --git a/src/ObjLoading/Game/T6/CustomMap/fbx/ufbx.c b/src/ObjLoading/Game/T6/CustomMap/fbx/ufbx.cpp
similarity index 100%
rename from src/ObjLoading/Game/T6/CustomMap/fbx/ufbx.c
rename to src/ObjLoading/Game/T6/CustomMap/fbx/ufbx.cpp
diff --git a/src/ObjLoading/Game/T6/ObjLoaderT6.cpp b/src/ObjLoading/Game/T6/ObjLoaderT6.cpp
index 796278d6..cb804970 100644
--- a/src/ObjLoading/Game/T6/ObjLoaderT6.cpp
+++ b/src/ObjLoading/Game/T6/ObjLoaderT6.cpp
@@ -42,6 +42,7 @@
 #include "Weapon/WeaponRawLoaderT6.h"
 #include "ZBarrier/GdtLoaderZBarrierT6.h"
 #include "ZBarrier/RawLoaderZBarrierT6.h"
+#include "CustomMap/LoaderCustomMapT6.h"
 
 #include <format>
 #include <memory>
@@ -439,6 +440,8 @@ namespace T6
             // collection.AddAssetCreator(std::make_unique<AssetLoaderFootstepFxTable>(memory));
             collection.AddAssetCreator(z_barrier::CreateRawLoaderT6(memory, searchPath, zone));
             collection.AddAssetCreator(z_barrier::CreateGdtLoaderT6(memory, searchPath, gdt, zone));
+
+            collection.AddAssetCreator(custom_map::CreateLoaderT6(memory, searchPath, zone));
         }
     } // namespace