diff --git a/src/Common/Game/IW3/IW3.h b/src/Common/Game/IW3/IW3.h
index 5120290f..889b87c4 100644
--- a/src/Common/Game/IW3/IW3.h
+++ b/src/Common/Game/IW3/IW3.h
@@ -96,6 +96,7 @@ namespace IW3
     using AssetSoundCurve = Asset<ASSET_TYPE_SOUND_CURVE, SndCurve>;
     using AssetLoadedSound = Asset<ASSET_TYPE_LOADED_SOUND, LoadedSound>;
     using AssetClipMap = Asset<ASSET_TYPE_CLIPMAP, clipMap_t>;
+    using AssetClipMapPvs = Asset<ASSET_TYPE_CLIPMAP_PVS, clipMap_t>;
     using AssetComWorld = Asset<ASSET_TYPE_COMWORLD, ComWorld>;
     using AssetGameWorldSp = Asset<ASSET_TYPE_GAMEWORLD_SP, GameWorldSp>;
     using AssetGameWorldMp = Asset<ASSET_TYPE_GAMEWORLD_MP, GameWorldMp>;
@@ -107,7 +108,7 @@ namespace IW3
     using AssetMenu = Asset<ASSET_TYPE_MENU, menuDef_t>;
     using AssetLocalize = Asset<ASSET_TYPE_LOCALIZE_ENTRY, LocalizeEntry>;
     using AssetWeapon = Asset<ASSET_TYPE_WEAPON, WeaponDef>;
-    using AssetSndDriverGlobals = Asset<ASSET_TYPE_SNDDRIVER_GLOBALS, SndDriverGlobals>;
+    using AssetSoundDriverGlobals = Asset<ASSET_TYPE_SNDDRIVER_GLOBALS, SndDriverGlobals>;
     using AssetFx = Asset<ASSET_TYPE_FX, FxEffectDef>;
     using AssetImpactFx = Asset<ASSET_TYPE_IMPACT_FX, FxImpactTable>;
     using AssetRawFile = Asset<ASSET_TYPE_RAWFILE, RawFile>;
diff --git a/src/Common/Game/T5/T5.h b/src/Common/Game/T5/T5.h
index 7f73a26a..efd71592 100644
--- a/src/Common/Game/T5/T5.h
+++ b/src/Common/Game/T5/T5.h
@@ -126,7 +126,8 @@ namespace T5
     using AssetImage = Asset<ASSET_TYPE_IMAGE, GfxImage>;
     using AssetSoundBank = Asset<ASSET_TYPE_SOUND, SndBank>;
     using AssetSoundPatch = Asset<ASSET_TYPE_SOUND_PATCH, SndPatch>;
-    using AssetClipMap = Asset<ASSET_TYPE_CLIPMAP_PVS, clipMap_t>;
+    using AssetClipMap = Asset<ASSET_TYPE_CLIPMAP, clipMap_t>;
+    using AssetClipMapPvs = Asset<ASSET_TYPE_CLIPMAP_PVS, clipMap_t>;
     using AssetComWorld = Asset<ASSET_TYPE_COMWORLD, ComWorld>;
     using AssetGameWorldSp = Asset<ASSET_TYPE_GAMEWORLD_SP, GameWorldSp>;
     using AssetGameWorldMp = Asset<ASSET_TYPE_GAMEWORLD_MP, GameWorldMp>;
diff --git a/src/Common/Game/T6/T6.h b/src/Common/Game/T6/T6.h
index 9d5a6f80..882e0141 100644
--- a/src/Common/Game/T6/T6.h
+++ b/src/Common/Game/T6/T6.h
@@ -170,7 +170,8 @@ namespace T6
     using AssetImage = Asset<ASSET_TYPE_IMAGE, GfxImage>;
     using AssetSoundBank = Asset<ASSET_TYPE_SOUND, SndBank>;
     using AssetSoundPatch = Asset<ASSET_TYPE_SOUND_PATCH, SndPatch>;
-    using AssetClipMap = Asset<ASSET_TYPE_CLIPMAP_PVS, clipMap_t>;
+    using AssetClipMap = Asset<ASSET_TYPE_CLIPMAP, clipMap_t>;
+    using AssetClipMapPvs = Asset<ASSET_TYPE_CLIPMAP_PVS, clipMap_t>;
     using AssetComWorld = Asset<ASSET_TYPE_COMWORLD, ComWorld>;
     using AssetGameWorldSp = Asset<ASSET_TYPE_GAMEWORLD_SP, GameWorldSp>;
     using AssetGameWorldMp = Asset<ASSET_TYPE_GAMEWORLD_MP, GameWorldMp>;
diff --git a/src/ObjLoading/AssetLoading/BasicAssetLoader.h b/src/ObjLoading/AssetLoading/BasicAssetLoader.h
index 0b27f9b0..d224fe26 100644
--- a/src/ObjLoading/AssetLoading/BasicAssetLoader.h
+++ b/src/ObjLoading/AssetLoading/BasicAssetLoader.h
@@ -11,11 +11,13 @@ public:
     }
 };
 
-template<asset_type_t AssetType, typename T> class BasicAssetLoader : public BasicAssetLoaderWithoutType<T>
+template<typename AssetType> class BasicAssetLoader : public BasicAssetLoaderWithoutType<typename AssetType::Type>
 {
 public:
+    static_assert(std::is_base_of_v<IAssetBase, AssetType>);
+
     _NODISCARD asset_type_t GetHandlingAssetType() const override
     {
-        return AssetType;
+        return AssetType::EnumEntry;
     }
 };
diff --git a/src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderGfxImage.h b/src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderGfxImage.h
index 1e8f2b50..d7f4be3c 100644
--- a/src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderGfxImage.h
+++ b/src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderGfxImage.h
@@ -6,7 +6,7 @@
 
 namespace IW3
 {
-    class AssetLoaderGfxImage final : public BasicAssetLoader<ASSET_TYPE_IMAGE, GfxImage>
+    class AssetLoaderGfxImage final : public BasicAssetLoader<AssetImage>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderLocalizeEntry.h b/src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderLocalizeEntry.h
index 24af4893..3174989d 100644
--- a/src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderLocalizeEntry.h
+++ b/src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderLocalizeEntry.h
@@ -7,7 +7,7 @@
 
 namespace IW3
 {
-    class AssetLoaderLocalizeEntry final : public BasicAssetLoader<ASSET_TYPE_LOCALIZE_ENTRY, LocalizeEntry>
+    class AssetLoaderLocalizeEntry final : public BasicAssetLoader<AssetLocalize>
     {
     public:
         _NODISCARD XAssetInfoGeneric* LoadFromGlobalAssetPools(const std::string& assetName) const override;
diff --git a/src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderRawFile.h b/src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderRawFile.h
index 3a2ac761..41d1e295 100644
--- a/src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderRawFile.h
+++ b/src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderRawFile.h
@@ -6,7 +6,7 @@
 
 namespace IW3
 {
-    class AssetLoaderRawFile final : public BasicAssetLoader<ASSET_TYPE_RAWFILE, RawFile>
+    class AssetLoaderRawFile final : public BasicAssetLoader<AssetRawFile>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderStringTable.h b/src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderStringTable.h
index ec7bebb1..a8a52387 100644
--- a/src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderStringTable.h
+++ b/src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderStringTable.h
@@ -6,7 +6,7 @@
 
 namespace IW3
 {
-    class AssetLoaderStringTable final : public BasicAssetLoader<ASSET_TYPE_STRINGTABLE, StringTable>
+    class AssetLoaderStringTable final : public BasicAssetLoader<AssetStringTable>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW3/ObjLoaderIW3.cpp b/src/ObjLoading/Game/IW3/ObjLoaderIW3.cpp
index 2bf52739..a67a013b 100644
--- a/src/ObjLoading/Game/IW3/ObjLoaderIW3.cpp
+++ b/src/ObjLoading/Game/IW3/ObjLoaderIW3.cpp
@@ -22,37 +22,35 @@ ObjLoader::ObjLoader()
         auto l = std::make_unique<t>();                                                                                                                        \
         m_asset_loaders_by_type[l->GetHandlingAssetType()] = std::move(l);                                                                                     \
     }
-#define BASIC_LOADER(assetType, assetClass) BasicAssetLoader<assetType, assetClass>
 
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_PHYSPRESET, PhysPreset))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_XANIMPARTS, XAnimParts))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_XMODEL, XModel))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MATERIAL, Material))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_TECHNIQUE_SET, MaterialTechniqueSet))
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetPhysPreset>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetXAnim>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetXModel>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetMaterial>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetTechniqueSet>)
     REGISTER_ASSET_LOADER(AssetLoaderGfxImage)
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_SOUND, snd_alias_list_t))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_SOUND_CURVE, SndCurve))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_LOADED_SOUND, LoadedSound))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_CLIPMAP, clipMap_t))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_CLIPMAP_PVS, clipMap_t))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_COMWORLD, ComWorld))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_GAMEWORLD_SP, GameWorldSp))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_GAMEWORLD_MP, GameWorldMp))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MAP_ENTS, MapEnts))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_GFXWORLD, GfxWorld))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_LIGHT_DEF, GfxLightDef))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_FONT, Font_s))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MENULIST, MenuList))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MENU, menuDef_t))
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetSound>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetSoundCurve>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetLoadedSound>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetClipMap>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetClipMapPvs>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetComWorld>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetGameWorldSp>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetGameWorldMp>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetMapEnts>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetGfxWorld>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetLightDef>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetFont>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetMenuList>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetMenu>)
     REGISTER_ASSET_LOADER(AssetLoaderLocalizeEntry)
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_WEAPON, WeaponDef))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_SNDDRIVER_GLOBALS, SndDriverGlobals))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_FX, FxEffectDef))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_IMPACT_FX, FxImpactTable))
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetWeapon>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetSoundDriverGlobals>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetFx>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetImpactFx>)
     REGISTER_ASSET_LOADER(AssetLoaderRawFile)
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_STRINGTABLE, StringTable))
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetStringTable>)
 
-#undef BASIC_LOADER
 #undef REGISTER_ASSET_LOADER
 }
 
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderAddonMapEnts.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderAddonMapEnts.h
index 43894c7f..119bbd73 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderAddonMapEnts.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderAddonMapEnts.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderAddonMapEnts final : public BasicAssetLoader<ASSET_TYPE_ADDON_MAP_ENTS, AddonMapEnts>
+    class AssetLoaderAddonMapEnts final : public BasicAssetLoader<AssetAddonMapEnts>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderComWorld.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderComWorld.h
index 3ae752f6..534ffa72 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderComWorld.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderComWorld.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderComWorld final : public BasicAssetLoader<ASSET_TYPE_COMWORLD, ComWorld>
+    class AssetLoaderComWorld final : public BasicAssetLoader<AssetComWorld>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderFont.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderFont.h
index 5917ac15..10175221 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderFont.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderFont.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderFont final : public BasicAssetLoader<ASSET_TYPE_FONT, Font_s>
+    class AssetLoaderFont final : public BasicAssetLoader<AssetFont>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderFx.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderFx.h
index aa3ea20c..3cddeb71 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderFx.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderFx.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderFx final : public BasicAssetLoader<ASSET_TYPE_FX, FxEffectDef>
+    class AssetLoaderFx final : public BasicAssetLoader<AssetFx>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderFxImpactTable.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderFxImpactTable.h
index 30b39ab7..b7ff4c10 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderFxImpactTable.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderFxImpactTable.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderFxImpactTable final : public BasicAssetLoader<ASSET_TYPE_IMPACT_FX, FxImpactTable>
+    class AssetLoaderFxImpactTable final : public BasicAssetLoader<AssetImpactFx>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderFxWorld.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderFxWorld.h
index 801a4e33..bbdc1ec6 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderFxWorld.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderFxWorld.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderFxWorld final : public BasicAssetLoader<ASSET_TYPE_FXWORLD, FxWorld>
+    class AssetLoaderFxWorld final : public BasicAssetLoader<AssetFxWorld>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGameWorldMp.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGameWorldMp.h
index d03a8c00..4b9ce827 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGameWorldMp.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGameWorldMp.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderGameWorldMp final : public BasicAssetLoader<ASSET_TYPE_GAMEWORLD_MP, GameWorldMp>
+    class AssetLoaderGameWorldMp final : public BasicAssetLoader<AssetGameWorldMp>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGameWorldSp.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGameWorldSp.h
index 1fb57260..f952186e 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGameWorldSp.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGameWorldSp.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderGameWorldSp final : public BasicAssetLoader<ASSET_TYPE_GAMEWORLD_SP, GameWorldSp>
+    class AssetLoaderGameWorldSp final : public BasicAssetLoader<AssetGameWorldSp>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGfxImage.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGfxImage.h
index 87c0e875..e63c470f 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGfxImage.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGfxImage.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderGfxImage final : public BasicAssetLoader<ASSET_TYPE_IMAGE, GfxImage>
+    class AssetLoaderGfxImage final : public BasicAssetLoader<AssetImage>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGfxLightDef.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGfxLightDef.h
index f4adfada..f8fbae58 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGfxLightDef.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGfxLightDef.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderGfxLightDef final : public BasicAssetLoader<ASSET_TYPE_LIGHT_DEF, GfxLightDef>
+    class AssetLoaderGfxLightDef final : public BasicAssetLoader<AssetLightDef>
     {
         static constexpr auto MAX_IMAGE_NAME_SIZE = 0x800;
 
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGfxWorld.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGfxWorld.h
index d3b47fc7..2f87ed12 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGfxWorld.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGfxWorld.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderGfxWorld final : public BasicAssetLoader<ASSET_TYPE_GFXWORLD, GfxWorld>
+    class AssetLoaderGfxWorld final : public BasicAssetLoader<AssetGfxWorld>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderLeaderboard.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderLeaderboard.h
index 5578aa7c..77386dff 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderLeaderboard.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderLeaderboard.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderLeaderboard final : public BasicAssetLoader<ASSET_TYPE_LEADERBOARD, LeaderboardDef>
+    class AssetLoaderLeaderboard final : public BasicAssetLoader<AssetLeaderBoard>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderLoadedSound.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderLoadedSound.h
index 284bbfb7..8b166f29 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderLoadedSound.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderLoadedSound.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderLoadedSound final : public BasicAssetLoader<ASSET_TYPE_LOADED_SOUND, LoadedSound>
+    class AssetLoaderLoadedSound final : public BasicAssetLoader<AssetLoadedSound>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderLocalizeEntry.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderLocalizeEntry.h
index 4dbf1521..b6964d7e 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderLocalizeEntry.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderLocalizeEntry.h
@@ -7,7 +7,7 @@
 
 namespace IW4
 {
-    class AssetLoaderLocalizeEntry final : public BasicAssetLoader<ASSET_TYPE_LOCALIZE_ENTRY, LocalizeEntry>
+    class AssetLoaderLocalizeEntry final : public BasicAssetLoader<AssetLocalize>
     {
     public:
         _NODISCARD XAssetInfoGeneric* LoadFromGlobalAssetPools(const std::string& assetName) const override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMapEnts.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMapEnts.h
index 8819c1ae..518e5666 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMapEnts.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMapEnts.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderMapEnts final : public BasicAssetLoader<ASSET_TYPE_MAP_ENTS, MapEnts>
+    class AssetLoaderMapEnts final : public BasicAssetLoader<AssetMapEnts>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMaterial.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMaterial.h
index d45fa6d9..d5642e7c 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMaterial.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMaterial.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderMaterial final : public BasicAssetLoader<ASSET_TYPE_MATERIAL, Material>
+    class AssetLoaderMaterial final : public BasicAssetLoader<AssetMaterial>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMenuDef.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMenuDef.h
index 983b2e98..35d0910a 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMenuDef.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMenuDef.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderMenuDef final : public BasicAssetLoader<ASSET_TYPE_MENU, menuDef_t>
+    class AssetLoaderMenuDef final : public BasicAssetLoader<AssetMenu>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMenuList.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMenuList.h
index 520d2d2b..88835e50 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMenuList.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMenuList.h
@@ -7,7 +7,7 @@
 
 namespace IW4
 {
-    class AssetLoaderMenuList final : public BasicAssetLoader<ASSET_TYPE_MENULIST, MenuList>
+    class AssetLoaderMenuList final : public BasicAssetLoader<AssetMenuList>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPhysCollmap.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPhysCollmap.h
index f2195585..86cbed6c 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPhysCollmap.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPhysCollmap.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderPhysCollmap final : public BasicAssetLoader<ASSET_TYPE_PHYSCOLLMAP, PhysCollmap>
+    class AssetLoaderPhysCollmap final : public BasicAssetLoader<AssetPhysCollMap>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPhysPreset.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPhysPreset.h
index 906ffaae..4d3730bb 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPhysPreset.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPhysPreset.h
@@ -7,7 +7,7 @@
 
 namespace IW4
 {
-    class AssetLoaderPhysPreset final : public BasicAssetLoader<ASSET_TYPE_PHYSPRESET, PhysPreset>
+    class AssetLoaderPhysPreset final : public BasicAssetLoader<AssetPhysPreset>
     {
         static void CopyFromPhysPresetInfo(const PhysPresetInfo* physPresetInfo, PhysPreset* physPreset);
 
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPixelShader.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPixelShader.h
index a062bc9c..3ac44c5c 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPixelShader.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPixelShader.h
@@ -8,7 +8,7 @@
 
 namespace IW4
 {
-    class AssetLoaderPixelShader final : public BasicAssetLoader<ASSET_TYPE_PIXELSHADER, MaterialPixelShader>
+    class AssetLoaderPixelShader final : public BasicAssetLoader<AssetPixelShader>
     {
     public:
         _NODISCARD static std::string GetFileNameForAsset(const std::string& assetName);
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderRawFile.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderRawFile.h
index 4d5a0b75..c8b558cc 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderRawFile.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderRawFile.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderRawFile final : public BasicAssetLoader<ASSET_TYPE_RAWFILE, RawFile>
+    class AssetLoaderRawFile final : public BasicAssetLoader<AssetRawFile>
     {
         static constexpr size_t COMPRESSED_BUFFER_SIZE_PADDING = 64;
 
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderSndCurve.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderSndCurve.h
index 5dea47ab..1d184ef1 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderSndCurve.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderSndCurve.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderSndCurve final : public BasicAssetLoader<ASSET_TYPE_SOUND_CURVE, SndCurve>
+    class AssetLoaderSndCurve final : public BasicAssetLoader<AssetSoundCurve>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderSoundAliasList.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderSoundAliasList.h
index 3abc1af4..86177d8b 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderSoundAliasList.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderSoundAliasList.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderSoundAliasList final : public BasicAssetLoader<ASSET_TYPE_SOUND, snd_alias_list_t>
+    class AssetLoaderSoundAliasList final : public BasicAssetLoader<AssetSound>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStringTable.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStringTable.h
index 2ef3af3e..19fe5caa 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStringTable.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStringTable.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderStringTable final : public BasicAssetLoader<ASSET_TYPE_STRINGTABLE, StringTable>
+    class AssetLoaderStringTable final : public BasicAssetLoader<AssetStringTable>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStructuredDataDefSet.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStructuredDataDefSet.h
index d867b8ea..ef57fc8e 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStructuredDataDefSet.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStructuredDataDefSet.h
@@ -7,7 +7,7 @@
 
 namespace IW4
 {
-    class AssetLoaderStructuredDataDefSet final : public BasicAssetLoader<ASSET_TYPE_STRUCTURED_DATA_DEF, StructuredDataDefSet>
+    class AssetLoaderStructuredDataDefSet final : public BasicAssetLoader<AssetStructuredDataDef>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderTechniqueSet.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderTechniqueSet.h
index 9c58885f..e66a9d67 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderTechniqueSet.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderTechniqueSet.h
@@ -10,7 +10,7 @@
 
 namespace IW4
 {
-    class AssetLoaderTechniqueSet final : public BasicAssetLoader<ASSET_TYPE_TECHNIQUE_SET, MaterialTechniqueSet>
+    class AssetLoaderTechniqueSet final : public BasicAssetLoader<AssetTechniqueSet>
     {
         static bool CreateTechsetFromDefinition(const std::string& assetName,
                                                 const techset::TechsetDefinition& definition,
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderTracer.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderTracer.h
index 969e3048..c501ad39 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderTracer.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderTracer.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderTracer final : public BasicAssetLoader<ASSET_TYPE_TRACER, TracerDef>
+    class AssetLoaderTracer final : public BasicAssetLoader<AssetTracer>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVehicle.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVehicle.h
index 62e484b3..d260d853 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVehicle.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVehicle.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderVehicle final : public BasicAssetLoader<ASSET_TYPE_VEHICLE, VehicleDef>
+    class AssetLoaderVehicle final : public BasicAssetLoader<AssetVehicle>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVertexDecl.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVertexDecl.h
index 14cdde67..939c3a8c 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVertexDecl.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVertexDecl.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderVertexDecl final : public BasicAssetLoader<ASSET_TYPE_VERTEXDECL, MaterialVertexDeclaration>
+    class AssetLoaderVertexDecl final : public BasicAssetLoader<AssetVertexDecl>
     {
         static bool NextAbbreviation(const std::string& assetName, std::string& abbreviation, size_t& offset);
 
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVertexShader.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVertexShader.h
index a52368eb..6a72596b 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVertexShader.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVertexShader.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderVertexShader final : public BasicAssetLoader<ASSET_TYPE_VERTEXSHADER, MaterialVertexShader>
+    class AssetLoaderVertexShader final : public BasicAssetLoader<AssetVertexShader>
     {
     public:
         _NODISCARD static std::string GetFileNameForAsset(const std::string& assetName);
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.h
index b176d8ee..51e69d8c 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderWeapon final : public BasicAssetLoader<ASSET_TYPE_WEAPON, WeaponCompleteDef>
+    class AssetLoaderWeapon final : public BasicAssetLoader<AssetWeapon>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderXAnim.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderXAnim.h
index 1bf98bb5..a44bbdb7 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderXAnim.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderXAnim.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderXAnim final : public BasicAssetLoader<ASSET_TYPE_XANIMPARTS, XAnimParts>
+    class AssetLoaderXAnim final : public BasicAssetLoader<AssetXAnim>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderXModel.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderXModel.h
index e9c80b68..50af413d 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderXModel.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderXModel.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderXModel final : public BasicAssetLoader<ASSET_TYPE_XMODEL, XModel>
+    class AssetLoaderXModel final : public BasicAssetLoader<AssetXModel>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderXModelSurfs.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderXModelSurfs.h
index 6334ebd5..d7751ae3 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderXModelSurfs.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderXModelSurfs.h
@@ -6,7 +6,7 @@
 
 namespace IW4
 {
-    class AssetLoaderXModelSurfs final : public BasicAssetLoader<ASSET_TYPE_XMODEL_SURFS, XModelSurfs>
+    class AssetLoaderXModelSurfs final : public BasicAssetLoader<AssetXModelSurfs>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderAddonMapEnts.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderAddonMapEnts.h
index 7c436fdc..a1b308ac 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderAddonMapEnts.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderAddonMapEnts.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderAddonMapEnts final : public BasicAssetLoader<ASSET_TYPE_ADDON_MAP_ENTS, AddonMapEnts>
+    class AssetLoaderAddonMapEnts final : public BasicAssetLoader<AssetAddonMapEnts>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderClipMap.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderClipMap.h
index 86e27f49..8b4d0d75 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderClipMap.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderClipMap.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderClipMap : public BasicAssetLoader<ASSET_TYPE_CLIPMAP, clipMap_t>
+    class AssetLoaderClipMap : public BasicAssetLoader<AssetClipMap>
     {
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
     };
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderComWorld.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderComWorld.h
index c48daeb6..a491a99f 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderComWorld.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderComWorld.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderComWorld final : public BasicAssetLoader<ASSET_TYPE_COMWORLD, ComWorld>
+    class AssetLoaderComWorld final : public BasicAssetLoader<AssetComWorld>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderFont.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderFont.h
index 959ad81c..ff08dd9f 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderFont.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderFont.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderFont final : public BasicAssetLoader<ASSET_TYPE_FONT, Font_s>
+    class AssetLoaderFont final : public BasicAssetLoader<AssetFont>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderFx.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderFx.h
index d9818e15..1040158d 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderFx.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderFx.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderFx final : public BasicAssetLoader<ASSET_TYPE_FX, FxEffectDef>
+    class AssetLoaderFx final : public BasicAssetLoader<AssetFx>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderFxImpactTable.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderFxImpactTable.h
index 8eb06d7f..577fe178 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderFxImpactTable.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderFxImpactTable.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderFxImpactTable final : public BasicAssetLoader<ASSET_TYPE_IMPACT_FX, FxImpactTable>
+    class AssetLoaderFxImpactTable final : public BasicAssetLoader<AssetImpactFx>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderFxWorld.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderFxWorld.h
index 4f50f068..5e7005af 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderFxWorld.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderFxWorld.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderFxWorld final : public BasicAssetLoader<ASSET_TYPE_FXWORLD, FxWorld>
+    class AssetLoaderFxWorld final : public BasicAssetLoader<AssetFxWorld>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderGfxImage.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderGfxImage.h
index 8f7a9f41..d334ca35 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderGfxImage.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderGfxImage.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderGfxImage final : public BasicAssetLoader<ASSET_TYPE_IMAGE, GfxImage>
+    class AssetLoaderGfxImage final : public BasicAssetLoader<AssetImage>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderGfxLightDef.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderGfxLightDef.h
index f835ae77..7bb44a97 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderGfxLightDef.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderGfxLightDef.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderGfxLightDef final : public BasicAssetLoader<ASSET_TYPE_LIGHT_DEF, GfxLightDef>
+    class AssetLoaderGfxLightDef final : public BasicAssetLoader<AssetLightDef>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderGfxWorld.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderGfxWorld.h
index fd374cf2..d967cc06 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderGfxWorld.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderGfxWorld.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderGfxWorld final : public BasicAssetLoader<ASSET_TYPE_GFXWORLD, GfxWorld>
+    class AssetLoaderGfxWorld final : public BasicAssetLoader<AssetGfxWorld>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderGlassWorld.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderGlassWorld.h
index cbea3768..6fb2162b 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderGlassWorld.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderGlassWorld.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderGlassWorld final : public BasicAssetLoader<ASSET_TYPE_GLASSWORLD, GlassWorld>
+    class AssetLoaderGlassWorld final : public BasicAssetLoader<AssetGlassWorld>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLeaderboard.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLeaderboard.h
index 4c4cb9c1..9dc3d70f 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLeaderboard.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLeaderboard.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderLeaderboard final : public BasicAssetLoader<ASSET_TYPE_LEADERBOARD, LeaderboardDef>
+    class AssetLoaderLeaderboard final : public BasicAssetLoader<AssetLeaderBoard>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLoadedSound.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLoadedSound.h
index d1f49793..cf6f0ca0 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLoadedSound.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLoadedSound.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderLoadedSound final : public BasicAssetLoader<ASSET_TYPE_LOADED_SOUND, LoadedSound>
+    class AssetLoaderLoadedSound final : public BasicAssetLoader<AssetLoadedSound>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLocalizeEntry.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLocalizeEntry.h
index e35c2fd5..5d8d7e92 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLocalizeEntry.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLocalizeEntry.h
@@ -7,7 +7,7 @@
 
 namespace IW5
 {
-    class AssetLoaderLocalizeEntry final : public BasicAssetLoader<ASSET_TYPE_LOCALIZE_ENTRY, LocalizeEntry>
+    class AssetLoaderLocalizeEntry final : public BasicAssetLoader<AssetLocalize>
     {
     public:
         _NODISCARD XAssetInfoGeneric* LoadFromGlobalAssetPools(const std::string& assetName) const override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMapEnts.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMapEnts.h
index a00cc614..783d475a 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMapEnts.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMapEnts.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderMapEnts final : public BasicAssetLoader<ASSET_TYPE_MAP_ENTS, MapEnts>
+    class AssetLoaderMapEnts final : public BasicAssetLoader<AssetMapEnts>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMaterial.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMaterial.h
index 7a7a08f0..b61c8965 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMaterial.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMaterial.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderMaterial final : public BasicAssetLoader<ASSET_TYPE_MATERIAL, Material>
+    class AssetLoaderMaterial final : public BasicAssetLoader<AssetMaterial>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMenuDef.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMenuDef.h
index eda17435..24764024 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMenuDef.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMenuDef.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderMenuDef final : public BasicAssetLoader<ASSET_TYPE_MENU, menuDef_t>
+    class AssetLoaderMenuDef final : public BasicAssetLoader<AssetMenu>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMenuList.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMenuList.h
index a721acc2..42d9a410 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMenuList.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMenuList.h
@@ -7,7 +7,7 @@
 
 namespace IW5
 {
-    class AssetLoaderMenuList final : public BasicAssetLoader<ASSET_TYPE_MENULIST, MenuList>
+    class AssetLoaderMenuList final : public BasicAssetLoader<AssetMenuList>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderPathData.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderPathData.h
index 6777c625..700b0baf 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderPathData.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderPathData.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderPathData final : public BasicAssetLoader<ASSET_TYPE_PATHDATA, PathData>
+    class AssetLoaderPathData final : public BasicAssetLoader<AssetPathData>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderPhysCollmap.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderPhysCollmap.h
index 2edb3742..08d76909 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderPhysCollmap.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderPhysCollmap.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderPhysCollmap final : public BasicAssetLoader<ASSET_TYPE_PHYSCOLLMAP, PhysCollmap>
+    class AssetLoaderPhysCollmap final : public BasicAssetLoader<AssetPhysCollMap>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderPhysPreset.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderPhysPreset.h
index c6f9e262..59abe996 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderPhysPreset.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderPhysPreset.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderPhysPreset final : public BasicAssetLoader<ASSET_TYPE_PHYSPRESET, PhysPreset>
+    class AssetLoaderPhysPreset final : public BasicAssetLoader<AssetPhysPreset>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderPixelShader.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderPixelShader.h
index 0b24cf3f..47bc4253 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderPixelShader.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderPixelShader.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderPixelShader final : public BasicAssetLoader<ASSET_TYPE_PIXELSHADER, MaterialPixelShader>
+    class AssetLoaderPixelShader final : public BasicAssetLoader<AssetPixelShader>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderRawFile.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderRawFile.h
index 16df945a..94d235ef 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderRawFile.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderRawFile.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderRawFile final : public BasicAssetLoader<ASSET_TYPE_RAWFILE, RawFile>
+    class AssetLoaderRawFile final : public BasicAssetLoader<AssetRawFile>
     {
         static constexpr size_t COMPRESSED_BUFFER_SIZE_PADDING = 64;
 
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderScriptFile.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderScriptFile.h
index 3c1dc051..3cb47778 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderScriptFile.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderScriptFile.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderScriptFile final : public BasicAssetLoader<ASSET_TYPE_SCRIPTFILE, ScriptFile>
+    class AssetLoaderScriptFile final : public BasicAssetLoader<AssetScript>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderSoundAliasList.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderSoundAliasList.h
index aa9f5076..7301d230 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderSoundAliasList.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderSoundAliasList.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderSoundAliasList final : public BasicAssetLoader<ASSET_TYPE_SOUND, snd_alias_list_t>
+    class AssetLoaderSoundAliasList final : public BasicAssetLoader<AssetSound>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderSoundCurve.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderSoundCurve.h
index 454f1e23..15ced190 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderSoundCurve.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderSoundCurve.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderSoundCurve final : public BasicAssetLoader<ASSET_TYPE_SOUND_CURVE, SndCurve>
+    class AssetLoaderSoundCurve final : public BasicAssetLoader<AssetSoundCurve>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderStringTable.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderStringTable.h
index 334ba70d..80d1ce74 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderStringTable.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderStringTable.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderStringTable final : public BasicAssetLoader<ASSET_TYPE_STRINGTABLE, StringTable>
+    class AssetLoaderStringTable final : public BasicAssetLoader<AssetStringTable>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderStructuredDataDef.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderStructuredDataDef.h
index 3cd107b5..901d589e 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderStructuredDataDef.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderStructuredDataDef.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderStructuredDataDef final : public BasicAssetLoader<ASSET_TYPE_STRUCTURED_DATA_DEF, StructuredDataDefSet>
+    class AssetLoaderStructuredDataDef final : public BasicAssetLoader<AssetStructuredDataDef>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderSurfaceFxTable.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderSurfaceFxTable.h
index 390ad667..7ddda89c 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderSurfaceFxTable.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderSurfaceFxTable.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderSurfaceFxTable final : public BasicAssetLoader<ASSET_TYPE_SURFACE_FX, SurfaceFxTable>
+    class AssetLoaderSurfaceFxTable final : public BasicAssetLoader<AssetSurfaceFx>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderTechniqueSet.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderTechniqueSet.h
index df4a7265..9a280bd9 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderTechniqueSet.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderTechniqueSet.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderTechniqueSet final : public BasicAssetLoader<ASSET_TYPE_TECHNIQUE_SET, MaterialTechniqueSet>
+    class AssetLoaderTechniqueSet final : public BasicAssetLoader<AssetTechniqueSet>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderTracerDef.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderTracerDef.h
index 3efda088..7233dc28 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderTracerDef.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderTracerDef.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderTracerDef final : public BasicAssetLoader<ASSET_TYPE_TRACER, TracerDef>
+    class AssetLoaderTracerDef final : public BasicAssetLoader<AssetTracer>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderVehicleDef.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderVehicleDef.h
index c2390077..f17a38a2 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderVehicleDef.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderVehicleDef.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderVehicleDef final : public BasicAssetLoader<ASSET_TYPE_VEHICLE, VehicleDef>
+    class AssetLoaderVehicleDef final : public BasicAssetLoader<AssetVehicle>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderVehicleTrack.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderVehicleTrack.h
index 747d7aeb..66d171e5 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderVehicleTrack.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderVehicleTrack.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderVehicleTrack final : public BasicAssetLoader<ASSET_TYPE_VEHICLE_TRACK, VehicleTrack>
+    class AssetLoaderVehicleTrack final : public BasicAssetLoader<AssetVehicleTrack>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderVertexDecl.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderVertexDecl.h
index 0859e5da..2e8d7685 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderVertexDecl.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderVertexDecl.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderVertexDecl final : public BasicAssetLoader<ASSET_TYPE_VERTEXDECL, MaterialVertexDeclaration>
+    class AssetLoaderVertexDecl final : public BasicAssetLoader<AssetVertexDecl>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderVertexShader.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderVertexShader.h
index 492e40a8..dde8ba8d 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderVertexShader.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderVertexShader.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderVertexShader final : public BasicAssetLoader<ASSET_TYPE_VERTEXSHADER, MaterialVertexShader>
+    class AssetLoaderVertexShader final : public BasicAssetLoader<AssetVertexShader>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeapon.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeapon.h
index e1cc9bca..67495344 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeapon.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeapon.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderWeapon final : public BasicAssetLoader<ASSET_TYPE_WEAPON, WeaponCompleteDef>
+    class AssetLoaderWeapon final : public BasicAssetLoader<AssetWeapon>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeaponAttachment.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeaponAttachment.h
index 56f4066b..72173e19 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeaponAttachment.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeaponAttachment.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderWeaponAttachment final : public BasicAssetLoader<ASSET_TYPE_ATTACHMENT, WeaponAttachment>
+    class AssetLoaderWeaponAttachment final : public BasicAssetLoader<AssetAttachment>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXAnim.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXAnim.h
index 077acd5f..16bf60a3 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXAnim.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXAnim.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderXAnim final : public BasicAssetLoader<ASSET_TYPE_XANIMPARTS, XAnimParts>
+    class AssetLoaderXAnim final : public BasicAssetLoader<AssetXAnim>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXModel.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXModel.h
index 3837f5e5..1ea4565d 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXModel.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXModel.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderXModel final : public BasicAssetLoader<ASSET_TYPE_XMODEL, XModel>
+    class AssetLoaderXModel final : public BasicAssetLoader<AssetXModel>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXModelSurfs.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXModelSurfs.h
index dfbfd1f9..2487afbe 100644
--- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXModelSurfs.h
+++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXModelSurfs.h
@@ -6,7 +6,7 @@
 
 namespace IW5
 {
-    class AssetLoaderXModelSurfs final : public BasicAssetLoader<ASSET_TYPE_XMODEL_SURFS, XModelSurfs>
+    class AssetLoaderXModelSurfs final : public BasicAssetLoader<AssetXModelSurfs>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/IW5/ObjLoaderIW5.cpp b/src/ObjLoading/Game/IW5/ObjLoaderIW5.cpp
index d577cae1..a05d69a1 100644
--- a/src/ObjLoading/Game/IW5/ObjLoaderIW5.cpp
+++ b/src/ObjLoading/Game/IW5/ObjLoaderIW5.cpp
@@ -59,7 +59,6 @@ ObjLoader::ObjLoader()
         auto l = std::make_unique<t>();                                                                                                                        \
         m_asset_loaders_by_type[l->GetHandlingAssetType()] = std::move(l);                                                                                     \
     }
-#define BASIC_LOADER(assetType, assetClass) BasicAssetLoader<assetType, assetClass>
 
     REGISTER_ASSET_LOADER(AssetLoaderPhysPreset)
     REGISTER_ASSET_LOADER(AssetLoaderPhysCollmap)
@@ -102,7 +101,6 @@ ObjLoader::ObjLoader()
     REGISTER_ASSET_LOADER(AssetLoaderVehicleDef)
     REGISTER_ASSET_LOADER(AssetLoaderAddonMapEnts)
 
-#undef BASIC_LOADER
 #undef REGISTER_ASSET_LOADER
 }
 
diff --git a/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderLocalizeEntry.h b/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderLocalizeEntry.h
index 005f51cc..3033df86 100644
--- a/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderLocalizeEntry.h
+++ b/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderLocalizeEntry.h
@@ -7,7 +7,7 @@
 
 namespace T5
 {
-    class AssetLoaderLocalizeEntry final : public BasicAssetLoader<ASSET_TYPE_LOCALIZE_ENTRY, LocalizeEntry>
+    class AssetLoaderLocalizeEntry final : public BasicAssetLoader<AssetLocalize>
     {
     public:
         _NODISCARD XAssetInfoGeneric* LoadFromGlobalAssetPools(const std::string& assetName) const override;
diff --git a/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderRawFile.h b/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderRawFile.h
index 572ce670..54bc33a7 100644
--- a/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderRawFile.h
+++ b/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderRawFile.h
@@ -6,7 +6,7 @@
 
 namespace T5
 {
-    class AssetLoaderRawFile final : public BasicAssetLoader<ASSET_TYPE_RAWFILE, RawFile>
+    class AssetLoaderRawFile final : public BasicAssetLoader<AssetRawFile>
     {
         static constexpr size_t COMPRESSED_BUFFER_SIZE_PADDING = 64;
 
diff --git a/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderStringTable.h b/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderStringTable.h
index 963b5599..fc90f9a8 100644
--- a/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderStringTable.h
+++ b/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderStringTable.h
@@ -6,7 +6,7 @@
 
 namespace T5
 {
-    class AssetLoaderStringTable final : public BasicAssetLoader<ASSET_TYPE_STRINGTABLE, StringTable>
+    class AssetLoaderStringTable final : public BasicAssetLoader<AssetStringTable>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/T5/ObjLoaderT5.cpp b/src/ObjLoading/Game/T5/ObjLoaderT5.cpp
index ee43e1a5..16b38fb2 100644
--- a/src/ObjLoading/Game/T5/ObjLoaderT5.cpp
+++ b/src/ObjLoading/Game/T5/ObjLoaderT5.cpp
@@ -22,43 +22,41 @@ ObjLoader::ObjLoader()
         auto l = std::make_unique<t>();                                                                                                                        \
         m_asset_loaders_by_type[l->GetHandlingAssetType()] = std::move(l);                                                                                     \
     }
-#define BASIC_LOADER(assetType, assetClass) BasicAssetLoader<assetType, assetClass>
 
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_PHYSPRESET, PhysPreset))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_PHYSCONSTRAINTS, PhysConstraints))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_DESTRUCTIBLEDEF, DestructibleDef))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_XANIMPARTS, XAnimParts))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_XMODEL, XModel))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MATERIAL, Material))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_TECHNIQUE_SET, MaterialTechniqueSet))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_IMAGE, GfxImage))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_SOUND, SndBank))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_SOUND_PATCH, SndPatch))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_CLIPMAP, clipMap_t))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_CLIPMAP_PVS, clipMap_t))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_COMWORLD, ComWorld))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_GAMEWORLD_SP, GameWorldSp))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_GAMEWORLD_MP, GameWorldMp))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MAP_ENTS, MapEnts))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_GFXWORLD, GfxWorld))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_LIGHT_DEF, GfxLightDef))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_FONT, Font_s))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MENULIST, MenuList))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MENU, menuDef_t))
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetPhysPreset>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetPhysConstraints>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetDestructibleDef>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetXAnim>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetXModel>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetMaterial>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetTechniqueSet>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetImage>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetSoundBank>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetSoundPatch>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetClipMap>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetClipMapPvs>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetComWorld>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetGameWorldSp>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetGameWorldMp>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetMapEnts>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetGfxWorld>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetLightDef>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetFont>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetMenuList>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetMenu>)
     REGISTER_ASSET_LOADER(AssetLoaderLocalizeEntry)
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_WEAPON, WeaponVariantDef))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_SNDDRIVER_GLOBALS, SndDriverGlobals))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_FX, FxEffectDef))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_IMPACT_FX, FxImpactTable))
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetWeapon>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetSoundDriverGlobals>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetFx>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetImpactFx>)
     REGISTER_ASSET_LOADER(AssetLoaderRawFile)
     REGISTER_ASSET_LOADER(AssetLoaderStringTable)
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_PACK_INDEX, PackIndex))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_XGLOBALS, XGlobals))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_DDL, ddlRoot_t))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_GLASSES, Glasses))
-    REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_EMBLEMSET, EmblemSet))
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetPackIndex>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetXGlobals>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetDDL>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetGlasses>)
+    REGISTER_ASSET_LOADER(BasicAssetLoader<AssetEmblemSet>)
 
-#undef BASIC_LOADER
 #undef REGISTER_ASSET_LOADER
 }
 
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFontIcon.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFontIcon.h
index cd995fe7..7f78f0ee 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFontIcon.h
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFontIcon.h
@@ -11,7 +11,7 @@
 
 namespace T6
 {
-    class AssetLoaderFontIcon final : public BasicAssetLoader<ASSET_TYPE_FONTICON, FontIcon>
+    class AssetLoaderFontIcon final : public BasicAssetLoader<AssetFontIcon>
     {
         static constexpr unsigned ROW_INDEX = 0;
         static constexpr unsigned ROW_TYPE = 1;
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxImage.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxImage.h
index fa6610dc..c88788bd 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxImage.h
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxImage.h
@@ -6,7 +6,7 @@
 
 namespace T6
 {
-    class AssetLoaderGfxImage final : public BasicAssetLoader<ASSET_TYPE_IMAGE, GfxImage>
+    class AssetLoaderGfxImage final : public BasicAssetLoader<AssetImage>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderLocalizeEntry.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderLocalizeEntry.h
index 7afa4a7a..62b218ac 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderLocalizeEntry.h
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderLocalizeEntry.h
@@ -6,7 +6,7 @@
 
 namespace T6
 {
-    class AssetLoaderLocalizeEntry final : public BasicAssetLoader<ASSET_TYPE_LOCALIZE_ENTRY, LocalizeEntry>
+    class AssetLoaderLocalizeEntry final : public BasicAssetLoader<AssetLocalize>
     {
     public:
         _NODISCARD XAssetInfoGeneric* LoadFromGlobalAssetPools(const std::string& assetName) const override;
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMaterial.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMaterial.h
index c47c026b..6ed4075e 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMaterial.h
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMaterial.h
@@ -6,7 +6,7 @@
 
 namespace T6
 {
-    class AssetLoaderMaterial final : public BasicAssetLoader<ASSET_TYPE_MATERIAL, Material>
+    class AssetLoaderMaterial final : public BasicAssetLoader<AssetMaterial>
     {
         static std::string GetFileNameForAsset(const std::string& assetName);
 
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderPhysConstraints.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderPhysConstraints.h
index 9064e116..c8b54e75 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderPhysConstraints.h
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderPhysConstraints.h
@@ -7,7 +7,7 @@
 
 namespace T6
 {
-    class AssetLoaderPhysConstraints final : public BasicAssetLoader<ASSET_TYPE_PHYSCONSTRAINTS, PhysConstraints>
+    class AssetLoaderPhysConstraints final : public BasicAssetLoader<AssetPhysConstraints>
     {
         static void CalculatePhysConstraintsFields(PhysConstraints* physConstraints, Zone* zone);
 
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderPhysPreset.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderPhysPreset.h
index 3483874e..a0c6db0b 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderPhysPreset.h
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderPhysPreset.h
@@ -7,7 +7,7 @@
 
 namespace T6
 {
-    class AssetLoaderPhysPreset final : public BasicAssetLoader<ASSET_TYPE_PHYSPRESET, PhysPreset>
+    class AssetLoaderPhysPreset final : public BasicAssetLoader<AssetPhysPreset>
     {
         static void CopyFromPhysPresetInfo(const PhysPresetInfo* physPresetInfo, PhysPreset* physPreset);
 
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderQdb.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderQdb.h
index af4c5b59..ad5f2e13 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderQdb.h
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderQdb.h
@@ -6,7 +6,7 @@
 
 namespace T6
 {
-    class AssetLoaderQdb final : public BasicAssetLoader<ASSET_TYPE_QDB, Qdb>
+    class AssetLoaderQdb final : public BasicAssetLoader<AssetQdb>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.h
index 4b7e0f05..2e4a5412 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.h
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.h
@@ -6,7 +6,7 @@
 
 namespace T6
 {
-    class AssetLoaderRawFile final : public BasicAssetLoader<ASSET_TYPE_RAWFILE, RawFile>
+    class AssetLoaderRawFile final : public BasicAssetLoader<AssetRawFile>
     {
         static constexpr size_t COMPRESSED_BUFFER_SIZE_PADDING = 64;
 
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderScriptParseTree.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderScriptParseTree.h
index 61325828..2d4ea3e2 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderScriptParseTree.h
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderScriptParseTree.h
@@ -6,7 +6,7 @@
 
 namespace T6
 {
-    class AssetLoaderScriptParseTree final : public BasicAssetLoader<ASSET_TYPE_SCRIPTPARSETREE, ScriptParseTree>
+    class AssetLoaderScriptParseTree final : public BasicAssetLoader<AssetScript>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSlug.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSlug.h
index 75ccd353..375a48ba 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSlug.h
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSlug.h
@@ -6,7 +6,7 @@
 
 namespace T6
 {
-    class AssetLoaderSlug final : public BasicAssetLoader<ASSET_TYPE_SLUG, Slug>
+    class AssetLoaderSlug final : public BasicAssetLoader<AssetSlug>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.h
index f7f8154d..2327467e 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.h
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.h
@@ -6,7 +6,7 @@
 
 namespace T6
 {
-    class AssetLoaderSoundBank final : public BasicAssetLoader<ASSET_TYPE_SOUND, SndBank>
+    class AssetLoaderSoundBank final : public BasicAssetLoader<AssetSoundBank>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderStringTable.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderStringTable.h
index d6b58ae9..2d9b3bc0 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderStringTable.h
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderStringTable.h
@@ -6,7 +6,7 @@
 
 namespace T6
 {
-    class AssetLoaderStringTable final : public BasicAssetLoader<ASSET_TYPE_STRINGTABLE, StringTable>
+    class AssetLoaderStringTable final : public BasicAssetLoader<AssetStringTable>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderTracer.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderTracer.h
index 323c2ee9..ea650439 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderTracer.h
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderTracer.h
@@ -7,7 +7,7 @@
 
 namespace T6
 {
-    class AssetLoaderTracer final : public BasicAssetLoader<ASSET_TYPE_TRACER, TracerDef>
+    class AssetLoaderTracer final : public BasicAssetLoader<AssetTracer>
     {
         static bool
             LoadFromInfoString(const InfoString& infoString, const std::string& assetName, MemoryManager* memory, IAssetLoadingManager* manager, Zone* zone);
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderVehicle.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderVehicle.h
index 1f91a42a..aaa6ccda 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderVehicle.h
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderVehicle.h
@@ -7,7 +7,7 @@
 
 namespace T6
 {
-    class AssetLoaderVehicle final : public BasicAssetLoader<ASSET_TYPE_VEHICLEDEF, VehicleDef>
+    class AssetLoaderVehicle final : public BasicAssetLoader<AssetVehicle>
     {
         static bool
             LoadFromInfoString(const InfoString& infoString, const std::string& assetName, MemoryManager* memory, IAssetLoadingManager* manager, Zone* zone);
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeapon.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeapon.h
index e2598748..9a9cb4fc 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeapon.h
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeapon.h
@@ -7,7 +7,7 @@
 
 namespace T6
 {
-    class AssetLoaderWeapon final : public BasicAssetLoader<ASSET_TYPE_WEAPON, WeaponVariantDef>
+    class AssetLoaderWeapon final : public BasicAssetLoader<AssetWeapon>
     {
         static void LinkWeaponFullDefSubStructs(WeaponFullDef* weapon);
 
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachment.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachment.h
index f5abfec8..9c03b87b 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachment.h
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachment.h
@@ -7,7 +7,7 @@
 
 namespace T6
 {
-    class AssetLoaderWeaponAttachment final : public BasicAssetLoader<ASSET_TYPE_ATTACHMENT, WeaponAttachment>
+    class AssetLoaderWeaponAttachment final : public BasicAssetLoader<AssetAttachment>
     {
         static void CalculateAttachmentFields(WeaponAttachment* attachment);
 
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachmentUnique.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachmentUnique.h
index 87399723..23f5548d 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachmentUnique.h
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachmentUnique.h
@@ -7,7 +7,7 @@
 
 namespace T6
 {
-    class AssetLoaderWeaponAttachmentUnique final : public BasicAssetLoader<ASSET_TYPE_ATTACHMENT_UNIQUE, WeaponAttachmentUnique>
+    class AssetLoaderWeaponAttachmentUnique final : public BasicAssetLoader<AssetAttachmentUnique>
     {
         static void LinkAttachmentUniqueFullSubStructs(WeaponAttachmentUniqueFull* attachmentUnique);
         static bool CalculateAttachmentUniqueFields(const std::string& assetName, WeaponAttachmentUniqueFull* attachmentUnique);
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponCamo.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponCamo.h
index 7c6fb2ac..bd8a75c6 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponCamo.h
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponCamo.h
@@ -6,7 +6,7 @@
 
 namespace T6
 {
-    class AssetLoaderWeaponCamo final : public BasicAssetLoader<ASSET_TYPE_WEAPON_CAMO, WeaponCamo>
+    class AssetLoaderWeaponCamo final : public BasicAssetLoader<AssetWeaponCamo>
     {
     public:
         _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXModel.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXModel.h
index 0e0115da..8a39a8dc 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXModel.h
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXModel.h
@@ -6,7 +6,7 @@
 
 namespace T6
 {
-    class AssetLoaderXModel final : public BasicAssetLoader<ASSET_TYPE_XMODEL, XModel>
+    class AssetLoaderXModel final : public BasicAssetLoader<AssetXModel>
     {
         static std::string GetFileNameForAsset(const std::string& assetName);
 
diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderZBarrier.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderZBarrier.h
index ee6c6d1f..77e23b17 100644
--- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderZBarrier.h
+++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderZBarrier.h
@@ -7,7 +7,7 @@
 
 namespace T6
 {
-    class AssetLoaderZBarrier final : public BasicAssetLoader<ASSET_TYPE_ZBARRIER, ZBarrierDef>
+    class AssetLoaderZBarrier final : public BasicAssetLoader<AssetZBarrier>
     {
         static void CalculateZBarrierFields(ZBarrierDef* zbarrier);
 
diff --git a/src/ObjLoading/Game/T6/ObjLoaderT6.cpp b/src/ObjLoading/Game/T6/ObjLoaderT6.cpp
index d52effbf..c8214d1a 100644
--- a/src/ObjLoading/Game/T6/ObjLoaderT6.cpp
+++ b/src/ObjLoading/Game/T6/ObjLoaderT6.cpp
@@ -44,59 +44,56 @@ namespace T6
         auto l = std::make_unique<t>();                                                                                                                        \
         m_asset_loaders_by_type[l->GetHandlingAssetType()] = std::move(l);                                                                                     \
     }
-#define BASIC_LOADER(assetType, assetClass) BasicAssetLoader<assetType, assetClass>
 
         REGISTER_ASSET_LOADER(AssetLoaderPhysPreset)
         REGISTER_ASSET_LOADER(AssetLoaderPhysConstraints)
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_DESTRUCTIBLEDEF, DestructibleDef))
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_XANIMPARTS, XAnimParts))
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_XMODEL, XModel))
-        // REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MATERIAL, Material))
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetDestructibleDef>)
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetXAnim>)
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetXModel>)
         REGISTER_ASSET_LOADER(AssetLoaderMaterial)
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_TECHNIQUE_SET, MaterialTechniqueSet))
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetTechniqueSet>)
         REGISTER_ASSET_LOADER(AssetLoaderGfxImage)
         REGISTER_ASSET_LOADER(AssetLoaderSoundBank)
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_SOUND_PATCH, SndPatch))
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_CLIPMAP, clipMap_t))
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_CLIPMAP_PVS, clipMap_t))
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_COMWORLD, ComWorld))
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_GAMEWORLD_SP, GameWorldSp))
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_GAMEWORLD_MP, GameWorldMp))
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MAP_ENTS, MapEnts))
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_GFXWORLD, GfxWorld))
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_LIGHT_DEF, GfxLightDef))
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_FONT, Font_s))
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetSoundPatch>)
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetClipMap>)
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetClipMapPvs>)
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetComWorld>)
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetGameWorldSp>)
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetGameWorldMp>)
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetMapEnts>)
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetGfxWorld>)
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetLightDef>)
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetFont>)
         REGISTER_ASSET_LOADER(AssetLoaderFontIcon)
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MENULIST, MenuList))
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MENU, menuDef_t))
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetMenuList>)
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetMenu>)
         REGISTER_ASSET_LOADER(AssetLoaderLocalizeEntry)
         REGISTER_ASSET_LOADER(AssetLoaderWeapon)
         REGISTER_ASSET_LOADER(AssetLoaderWeaponAttachment)
         REGISTER_ASSET_LOADER(AssetLoaderWeaponAttachmentUnique)
         REGISTER_ASSET_LOADER(AssetLoaderWeaponCamo)
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_SNDDRIVER_GLOBALS, SndDriverGlobals))
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_FX, FxEffectDef))
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_IMPACT_FX, FxImpactTable))
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetSoundDriverGlobals>)
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetFx>)
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetImpactFx>)
         REGISTER_ASSET_LOADER(AssetLoaderRawFile)
         REGISTER_ASSET_LOADER(AssetLoaderStringTable)
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_LEADERBOARD, LeaderboardDef))
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_XGLOBALS, XGlobals))
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_DDL, ddlRoot_t))
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_GLASSES, Glasses))
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_EMBLEMSET, EmblemSet))
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetLeaderBoard>)
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetXGlobals>)
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetDDL>)
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetGlasses>)
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetEmblemSet>)
         REGISTER_ASSET_LOADER(AssetLoaderScriptParseTree)
         REGISTER_ASSET_LOADER(AssetLoaderVehicle)
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MEMORYBLOCK, MemoryBlock))
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_ADDON_MAP_ENTS, AddonMapEnts))
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetMemoryBlock>)
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetAddonMapEnts>)
         REGISTER_ASSET_LOADER(AssetLoaderTracer)
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_SKINNEDVERTS, SkinnedVertsDef))
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetSkinnedVerts>)
         REGISTER_ASSET_LOADER(AssetLoaderQdb)
         REGISTER_ASSET_LOADER(AssetLoaderSlug)
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_FOOTSTEP_TABLE, FootstepTableDef))
-        REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_FOOTSTEPFX_TABLE, FootstepFXTableDef))
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetFootstepTable>)
+        REGISTER_ASSET_LOADER(BasicAssetLoader<AssetFootstepFxTable>)
         REGISTER_ASSET_LOADER(AssetLoaderZBarrier)
 
-#undef BASIC_LOADER
 #undef REGISTER_ASSET_LOADER
     }