diff --git a/src/ZoneCode/Game/IW3/XAssets/ComWorld.txt b/src/ZoneCode/Game/IW3/XAssets/ComWorld.txt
index 6bd5b8b9..4a9b9a3b 100644
--- a/src/ZoneCode/Game/IW3/XAssets/ComWorld.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/ComWorld.txt
@@ -4,7 +4,6 @@
 use ComWorld;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count primaryLights primaryLightCount;
 
 // ComPrimaryLight
diff --git a/src/ZoneCode/Game/IW3/XAssets/Font_s.txt b/src/ZoneCode/Game/IW3/XAssets/Font_s.txt
index f37cf707..dcc89931 100644
--- a/src/ZoneCode/Game/IW3/XAssets/Font_s.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/Font_s.txt
@@ -4,6 +4,5 @@
 use Font_s;
 set block XFILE_BLOCK_TEMP;
 set string fontName;
-set name fontName;
 set reusable glyphs;
 set count glyphs glyphCount;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW3/XAssets/FxEffectDef.txt b/src/ZoneCode/Game/IW3/XAssets/FxEffectDef.txt
index 93875b29..b4311136 100644
--- a/src/ZoneCode/Game/IW3/XAssets/FxEffectDef.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/FxEffectDef.txt
@@ -4,7 +4,6 @@
 use FxEffectDef;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count elemDefs elemDefCountEmission + elemDefCountLooping + elemDefCountOneShot;
 
 // FxElemDef
diff --git a/src/ZoneCode/Game/IW3/XAssets/FxImpactTable.txt b/src/ZoneCode/Game/IW3/XAssets/FxImpactTable.txt
index 6bc02194..b4d84282 100644
--- a/src/ZoneCode/Game/IW3/XAssets/FxImpactTable.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/FxImpactTable.txt
@@ -4,5 +4,4 @@
 use FxImpactTable;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count table 12;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW3/XAssets/GameWorldMp.txt b/src/ZoneCode/Game/IW3/XAssets/GameWorldMp.txt
index 27732a84..f93945f3 100644
--- a/src/ZoneCode/Game/IW3/XAssets/GameWorldMp.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/GameWorldMp.txt
@@ -3,5 +3,4 @@
 // =========================================
 use GameWorldMp;
 set block XFILE_BLOCK_TEMP;
-set string name;
-set name name;
\ No newline at end of file
+set string name;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW3/XAssets/GameWorldSp.txt b/src/ZoneCode/Game/IW3/XAssets/GameWorldSp.txt
index 18559f15..e073093b 100644
--- a/src/ZoneCode/Game/IW3/XAssets/GameWorldSp.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/GameWorldSp.txt
@@ -4,7 +4,6 @@
 use GameWorldSp;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 
 // PathData
 use PathData;
diff --git a/src/ZoneCode/Game/IW3/XAssets/GfxImage.txt b/src/ZoneCode/Game/IW3/XAssets/GfxImage.txt
index 900e9ea3..f7fc37a0 100644
--- a/src/ZoneCode/Game/IW3/XAssets/GfxImage.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/GfxImage.txt
@@ -5,7 +5,6 @@ use GfxImage;
 set block XFILE_BLOCK_TEMP;
 set action OnImageLoaded(GfxImage);
 set string name;
-set name name;
 reorder:
     name
     texture;
diff --git a/src/ZoneCode/Game/IW3/XAssets/GfxLightDef.txt b/src/ZoneCode/Game/IW3/XAssets/GfxLightDef.txt
index ca07fc87..4a2ea7c6 100644
--- a/src/ZoneCode/Game/IW3/XAssets/GfxLightDef.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/GfxLightDef.txt
@@ -3,5 +3,4 @@
 // =========================================
 use GfxLightDef;
 set block XFILE_BLOCK_TEMP;
-set string name;
-set name name;
\ No newline at end of file
+set string name;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW3/XAssets/GfxWorld.txt b/src/ZoneCode/Game/IW3/XAssets/GfxWorld.txt
index dfc85512..8bb1c933 100644
--- a/src/ZoneCode/Game/IW3/XAssets/GfxWorld.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/GfxWorld.txt
@@ -4,7 +4,6 @@
 use GfxWorld;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set string baseName;
 set count indices indexCount;
 set count skyStartSurfs skySurfCount;
diff --git a/src/ZoneCode/Game/IW3/XAssets/LoadedSound.txt b/src/ZoneCode/Game/IW3/XAssets/LoadedSound.txt
index 0cef20e5..d9131522 100644
--- a/src/ZoneCode/Game/IW3/XAssets/LoadedSound.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/LoadedSound.txt
@@ -4,7 +4,6 @@
 use LoadedSound;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 
 // MssSound
 use MssSound;
diff --git a/src/ZoneCode/Game/IW3/XAssets/LocalizeEntry.txt b/src/ZoneCode/Game/IW3/XAssets/LocalizeEntry.txt
index a93f61b4..6b3d560e 100644
--- a/src/ZoneCode/Game/IW3/XAssets/LocalizeEntry.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/LocalizeEntry.txt
@@ -4,5 +4,4 @@
 use LocalizeEntry;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set string value;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW3/XAssets/MapEnts.txt b/src/ZoneCode/Game/IW3/XAssets/MapEnts.txt
index 7540ff74..f5c82f08 100644
--- a/src/ZoneCode/Game/IW3/XAssets/MapEnts.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/MapEnts.txt
@@ -4,5 +4,4 @@
 use MapEnts;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count entityString numEntityChars;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW3/XAssets/Material.txt b/src/ZoneCode/Game/IW3/XAssets/Material.txt
index b0f52d34..d4ef7c6e 100644
--- a/src/ZoneCode/Game/IW3/XAssets/Material.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/Material.txt
@@ -4,7 +4,6 @@
 use Material;
 set block XFILE_BLOCK_TEMP;
 set string info::name;
-set name info::name;
 set reusable textureTable;
 set count textureTable textureCount;
 set reusable constantTable;
diff --git a/src/ZoneCode/Game/IW3/XAssets/MaterialTechniqueSet.txt b/src/ZoneCode/Game/IW3/XAssets/MaterialTechniqueSet.txt
index 2494619d..406c7870 100644
--- a/src/ZoneCode/Game/IW3/XAssets/MaterialTechniqueSet.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/MaterialTechniqueSet.txt
@@ -4,7 +4,6 @@
 use MaterialTechniqueSet;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set condition remappedTechniqueSet never;
 set reusable techniques;
 
diff --git a/src/ZoneCode/Game/IW3/XAssets/MenuList.txt b/src/ZoneCode/Game/IW3/XAssets/MenuList.txt
index 5db2bd62..640e6160 100644
--- a/src/ZoneCode/Game/IW3/XAssets/MenuList.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/MenuList.txt
@@ -4,5 +4,4 @@
 use MenuList;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count menus menuCount;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW3/XAssets/PhysPreset.txt b/src/ZoneCode/Game/IW3/XAssets/PhysPreset.txt
index 38346b9b..511d1189 100644
--- a/src/ZoneCode/Game/IW3/XAssets/PhysPreset.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/PhysPreset.txt
@@ -4,5 +4,4 @@
 use PhysPreset;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set string sndAliasPrefix;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW3/XAssets/RawFile.txt b/src/ZoneCode/Game/IW3/XAssets/RawFile.txt
index 29e05132..befbf1ec 100644
--- a/src/ZoneCode/Game/IW3/XAssets/RawFile.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/RawFile.txt
@@ -4,5 +4,4 @@
 use RawFile;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count buffer len + 1;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW3/XAssets/SndCurve.txt b/src/ZoneCode/Game/IW3/XAssets/SndCurve.txt
index 7c90a72a..9fa5f2da 100644
--- a/src/ZoneCode/Game/IW3/XAssets/SndCurve.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/SndCurve.txt
@@ -3,5 +3,4 @@
 // =========================================
 use SndCurve;
 set block XFILE_BLOCK_TEMP;
-set string filename;
-set name filename;
\ No newline at end of file
+set string filename;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW3/XAssets/StringTable.txt b/src/ZoneCode/Game/IW3/XAssets/StringTable.txt
index 0e036fff..99f21013 100644
--- a/src/ZoneCode/Game/IW3/XAssets/StringTable.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/StringTable.txt
@@ -4,6 +4,5 @@
 use StringTable;
 // String table is not in the temp block for some reason. nice.
 set string name;
-set name name;
 set string values;
 set count values columnCount * rowCount;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW3/XAssets/WeaponDef.txt b/src/ZoneCode/Game/IW3/XAssets/WeaponDef.txt
index 797d6682..290b6d19 100644
--- a/src/ZoneCode/Game/IW3/XAssets/WeaponDef.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/WeaponDef.txt
@@ -4,7 +4,6 @@
 use WeaponDef;
 set block XFILE_BLOCK_TEMP;
 set string szInternalName;
-set name szInternalName;
 set string szDisplayName;
 set string szOverlayName;
 set string szXAnims;
diff --git a/src/ZoneCode/Game/IW3/XAssets/XAnimParts.txt b/src/ZoneCode/Game/IW3/XAssets/XAnimParts.txt
index 529f3cab..52c89d2f 100644
--- a/src/ZoneCode/Game/IW3/XAssets/XAnimParts.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/XAnimParts.txt
@@ -4,7 +4,6 @@
 use XAnimParts;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set scriptstring names;
 set count names boneCount[9];
 set count notify notifyCount;
diff --git a/src/ZoneCode/Game/IW3/XAssets/XModel.txt b/src/ZoneCode/Game/IW3/XAssets/XModel.txt
index c2ebeaaa..72538b90 100644
--- a/src/ZoneCode/Game/IW3/XAssets/XModel.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/XModel.txt
@@ -4,7 +4,6 @@
 use XModel;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set scriptstring boneNames;
 set reusable boneNames;
 set count boneNames numBones;
diff --git a/src/ZoneCode/Game/IW3/XAssets/clipMap_t.txt b/src/ZoneCode/Game/IW3/XAssets/clipMap_t.txt
index c5186b25..72151cf7 100644
--- a/src/ZoneCode/Game/IW3/XAssets/clipMap_t.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/clipMap_t.txt
@@ -4,7 +4,6 @@
 use clipMap_t;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set reusable planes;
 set count planes planeCount;
 set count staticModelList numStaticModels;
diff --git a/src/ZoneCode/Game/IW3/XAssets/menuDef_t.txt b/src/ZoneCode/Game/IW3/XAssets/menuDef_t.txt
index ae9b961d..6c629643 100644
--- a/src/ZoneCode/Game/IW3/XAssets/menuDef_t.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/menuDef_t.txt
@@ -4,7 +4,6 @@
 use menuDef_t;
 set block XFILE_BLOCK_TEMP;
 set string window::name;
-set name window::name;
 set string font;
 set string onOpen;
 set string onClose;
diff --git a/src/ZoneCode/Game/IW3/XAssets/snd_alias_list_t.txt b/src/ZoneCode/Game/IW3/XAssets/snd_alias_list_t.txt
index c781faf9..352a25b1 100644
--- a/src/ZoneCode/Game/IW3/XAssets/snd_alias_list_t.txt
+++ b/src/ZoneCode/Game/IW3/XAssets/snd_alias_list_t.txt
@@ -4,7 +4,6 @@
 use snd_alias_list_t;
 set block XFILE_BLOCK_TEMP;
 set string aliasName;
-set name aliasName;
 set reusable head;
 set count head count;
 
diff --git a/src/ZoneCode/Game/IW4/XAssets/AddonMapEnts.txt b/src/ZoneCode/Game/IW4/XAssets/AddonMapEnts.txt
index 213a8428..4ab1b24c 100644
--- a/src/ZoneCode/Game/IW4/XAssets/AddonMapEnts.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/AddonMapEnts.txt
@@ -4,5 +4,4 @@
 use AddonMapEnts;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count entityString numEntityChars;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW4/XAssets/ComWorld.txt b/src/ZoneCode/Game/IW4/XAssets/ComWorld.txt
index 6bd5b8b9..4a9b9a3b 100644
--- a/src/ZoneCode/Game/IW4/XAssets/ComWorld.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/ComWorld.txt
@@ -4,7 +4,6 @@
 use ComWorld;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count primaryLights primaryLightCount;
 
 // ComPrimaryLight
diff --git a/src/ZoneCode/Game/IW4/XAssets/Font_s.txt b/src/ZoneCode/Game/IW4/XAssets/Font_s.txt
index f37cf707..dcc89931 100644
--- a/src/ZoneCode/Game/IW4/XAssets/Font_s.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/Font_s.txt
@@ -4,6 +4,5 @@
 use Font_s;
 set block XFILE_BLOCK_TEMP;
 set string fontName;
-set name fontName;
 set reusable glyphs;
 set count glyphs glyphCount;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW4/XAssets/FxEffectDef.txt b/src/ZoneCode/Game/IW4/XAssets/FxEffectDef.txt
index 1c89cf80..3b44b01f 100644
--- a/src/ZoneCode/Game/IW4/XAssets/FxEffectDef.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/FxEffectDef.txt
@@ -4,7 +4,6 @@
 use FxEffectDef;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count elemDefs elemDefCountEmission + elemDefCountLooping + elemDefCountOneShot;
 
 // FxElemDef
diff --git a/src/ZoneCode/Game/IW4/XAssets/FxImpactTable.txt b/src/ZoneCode/Game/IW4/XAssets/FxImpactTable.txt
index 990b4fcc..350a4c84 100644
--- a/src/ZoneCode/Game/IW4/XAssets/FxImpactTable.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/FxImpactTable.txt
@@ -4,5 +4,4 @@
 use FxImpactTable;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count table 15;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW4/XAssets/FxWorld.txt b/src/ZoneCode/Game/IW4/XAssets/FxWorld.txt
index 8f20223e..c759103f 100644
--- a/src/ZoneCode/Game/IW4/XAssets/FxWorld.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/FxWorld.txt
@@ -4,7 +4,6 @@
 use FxWorld;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 
 // FxGlassSystem
 use FxGlassSystem;
diff --git a/src/ZoneCode/Game/IW4/XAssets/GameWorldMp.txt b/src/ZoneCode/Game/IW4/XAssets/GameWorldMp.txt
index 27732a84..f93945f3 100644
--- a/src/ZoneCode/Game/IW4/XAssets/GameWorldMp.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/GameWorldMp.txt
@@ -3,5 +3,4 @@
 // =========================================
 use GameWorldMp;
 set block XFILE_BLOCK_TEMP;
-set string name;
-set name name;
\ No newline at end of file
+set string name;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW4/XAssets/GameWorldSp.txt b/src/ZoneCode/Game/IW4/XAssets/GameWorldSp.txt
index bca8ab69..e36cdaee 100644
--- a/src/ZoneCode/Game/IW4/XAssets/GameWorldSp.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/GameWorldSp.txt
@@ -4,7 +4,6 @@
 use GameWorldSp;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 
 // PathData
 use PathData;
diff --git a/src/ZoneCode/Game/IW4/XAssets/GfxImage.txt b/src/ZoneCode/Game/IW4/XAssets/GfxImage.txt
index 900e9ea3..f7fc37a0 100644
--- a/src/ZoneCode/Game/IW4/XAssets/GfxImage.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/GfxImage.txt
@@ -5,7 +5,6 @@ use GfxImage;
 set block XFILE_BLOCK_TEMP;
 set action OnImageLoaded(GfxImage);
 set string name;
-set name name;
 reorder:
     name
     texture;
diff --git a/src/ZoneCode/Game/IW4/XAssets/GfxLightDef.txt b/src/ZoneCode/Game/IW4/XAssets/GfxLightDef.txt
index ca07fc87..4a2ea7c6 100644
--- a/src/ZoneCode/Game/IW4/XAssets/GfxLightDef.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/GfxLightDef.txt
@@ -3,5 +3,4 @@
 // =========================================
 use GfxLightDef;
 set block XFILE_BLOCK_TEMP;
-set string name;
-set name name;
\ No newline at end of file
+set string name;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW4/XAssets/GfxWorld.txt b/src/ZoneCode/Game/IW4/XAssets/GfxWorld.txt
index d8069d2c..a92f6396 100644
--- a/src/ZoneCode/Game/IW4/XAssets/GfxWorld.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/GfxWorld.txt
@@ -4,7 +4,6 @@
 use GfxWorld;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set string baseName;
 set count skies skyCount;
 set count aabbTreeCounts dpvsPlanes::cellCount;
diff --git a/src/ZoneCode/Game/IW4/XAssets/LeaderboardDef.txt b/src/ZoneCode/Game/IW4/XAssets/LeaderboardDef.txt
index 8dd30900..cfc3c7f4 100644
--- a/src/ZoneCode/Game/IW4/XAssets/LeaderboardDef.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/LeaderboardDef.txt
@@ -4,7 +4,6 @@
 use LeaderboardDef;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count columns columnCount;
 
 // LbColumnDef
diff --git a/src/ZoneCode/Game/IW4/XAssets/LoadedSound.txt b/src/ZoneCode/Game/IW4/XAssets/LoadedSound.txt
index 0cef20e5..d9131522 100644
--- a/src/ZoneCode/Game/IW4/XAssets/LoadedSound.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/LoadedSound.txt
@@ -4,7 +4,6 @@
 use LoadedSound;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 
 // MssSound
 use MssSound;
diff --git a/src/ZoneCode/Game/IW4/XAssets/LocalizeEntry.txt b/src/ZoneCode/Game/IW4/XAssets/LocalizeEntry.txt
index a93f61b4..6b3d560e 100644
--- a/src/ZoneCode/Game/IW4/XAssets/LocalizeEntry.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/LocalizeEntry.txt
@@ -4,5 +4,4 @@
 use LocalizeEntry;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set string value;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW4/XAssets/MapEnts.txt b/src/ZoneCode/Game/IW4/XAssets/MapEnts.txt
index e8edf78e..39893790 100644
--- a/src/ZoneCode/Game/IW4/XAssets/MapEnts.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/MapEnts.txt
@@ -4,7 +4,6 @@
 use MapEnts;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count entityString numEntityChars;
 set count stages stageCount;
 
diff --git a/src/ZoneCode/Game/IW4/XAssets/Material.txt b/src/ZoneCode/Game/IW4/XAssets/Material.txt
index b0f52d34..d4ef7c6e 100644
--- a/src/ZoneCode/Game/IW4/XAssets/Material.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/Material.txt
@@ -4,7 +4,6 @@
 use Material;
 set block XFILE_BLOCK_TEMP;
 set string info::name;
-set name info::name;
 set reusable textureTable;
 set count textureTable textureCount;
 set reusable constantTable;
diff --git a/src/ZoneCode/Game/IW4/XAssets/MaterialPixelShader.txt b/src/ZoneCode/Game/IW4/XAssets/MaterialPixelShader.txt
index 76a69ebc..0cc485f6 100644
--- a/src/ZoneCode/Game/IW4/XAssets/MaterialPixelShader.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/MaterialPixelShader.txt
@@ -4,7 +4,6 @@
 use MaterialPixelShader;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 
 // GfxPixelShaderLoadDef
 set count GfxPixelShaderLoadDef::program programSize;
diff --git a/src/ZoneCode/Game/IW4/XAssets/MaterialTechniqueSet.txt b/src/ZoneCode/Game/IW4/XAssets/MaterialTechniqueSet.txt
index 1a6780c3..4769818a 100644
--- a/src/ZoneCode/Game/IW4/XAssets/MaterialTechniqueSet.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/MaterialTechniqueSet.txt
@@ -4,7 +4,6 @@
 use MaterialTechniqueSet;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set condition remappedTechniqueSet never;
 set reusable techniques;
 
diff --git a/src/ZoneCode/Game/IW4/XAssets/MaterialVertexDeclaration.txt b/src/ZoneCode/Game/IW4/XAssets/MaterialVertexDeclaration.txt
index fda4bd7a..9a848734 100644
--- a/src/ZoneCode/Game/IW4/XAssets/MaterialVertexDeclaration.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/MaterialVertexDeclaration.txt
@@ -4,7 +4,6 @@
 use MaterialVertexDeclaration;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 
 // MaterialVertexStreamRouting
 set condition MaterialVertexStreamRouting::decl never;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW4/XAssets/MaterialVertexShader.txt b/src/ZoneCode/Game/IW4/XAssets/MaterialVertexShader.txt
index c4731d45..434a4f84 100644
--- a/src/ZoneCode/Game/IW4/XAssets/MaterialVertexShader.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/MaterialVertexShader.txt
@@ -4,7 +4,6 @@
 use MaterialVertexShader;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 
 // GfxVertexShaderLoadDef
 set count GfxVertexShaderLoadDef::program programSize;
diff --git a/src/ZoneCode/Game/IW4/XAssets/MenuList.txt b/src/ZoneCode/Game/IW4/XAssets/MenuList.txt
index 5db2bd62..640e6160 100644
--- a/src/ZoneCode/Game/IW4/XAssets/MenuList.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/MenuList.txt
@@ -4,5 +4,4 @@
 use MenuList;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count menus menuCount;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW4/XAssets/PhysCollmap.txt b/src/ZoneCode/Game/IW4/XAssets/PhysCollmap.txt
index 09f0540f..af947b2f 100644
--- a/src/ZoneCode/Game/IW4/XAssets/PhysCollmap.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/PhysCollmap.txt
@@ -4,7 +4,6 @@
 use PhysCollmap;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count geoms count;
 
 // PhysGeomInfo
diff --git a/src/ZoneCode/Game/IW4/XAssets/PhysPreset.txt b/src/ZoneCode/Game/IW4/XAssets/PhysPreset.txt
index 38346b9b..511d1189 100644
--- a/src/ZoneCode/Game/IW4/XAssets/PhysPreset.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/PhysPreset.txt
@@ -4,5 +4,4 @@
 use PhysPreset;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set string sndAliasPrefix;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW4/XAssets/RawFile.txt b/src/ZoneCode/Game/IW4/XAssets/RawFile.txt
index fd5cc065..ecad8b17 100644
--- a/src/ZoneCode/Game/IW4/XAssets/RawFile.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/RawFile.txt
@@ -4,7 +4,6 @@
 use RawFile;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set condition data::compressedBuffer compressedLen > 0;
 set count data::compressedBuffer compressedLen;
 set count data::buffer len + 1;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW4/XAssets/SndCurve.txt b/src/ZoneCode/Game/IW4/XAssets/SndCurve.txt
index 7c90a72a..9fa5f2da 100644
--- a/src/ZoneCode/Game/IW4/XAssets/SndCurve.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/SndCurve.txt
@@ -3,5 +3,4 @@
 // =========================================
 use SndCurve;
 set block XFILE_BLOCK_TEMP;
-set string filename;
-set name filename;
\ No newline at end of file
+set string filename;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW4/XAssets/StringTable.txt b/src/ZoneCode/Game/IW4/XAssets/StringTable.txt
index 7e818127..2850c319 100644
--- a/src/ZoneCode/Game/IW4/XAssets/StringTable.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/StringTable.txt
@@ -4,7 +4,6 @@
 use StringTable;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count values columnCount * rowCount;
 
 // StringTableCell
diff --git a/src/ZoneCode/Game/IW4/XAssets/StructuredDataDefSet.txt b/src/ZoneCode/Game/IW4/XAssets/StructuredDataDefSet.txt
index 44c21d4e..faf36599 100644
--- a/src/ZoneCode/Game/IW4/XAssets/StructuredDataDefSet.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/StructuredDataDefSet.txt
@@ -4,7 +4,6 @@
 use StructuredDataDefSet;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count defs defCount;
 
 // StructuredDataDef
diff --git a/src/ZoneCode/Game/IW4/XAssets/TracerDef.txt b/src/ZoneCode/Game/IW4/XAssets/TracerDef.txt
index d51f996f..94508d6b 100644
--- a/src/ZoneCode/Game/IW4/XAssets/TracerDef.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/TracerDef.txt
@@ -3,5 +3,4 @@
 // =========================================
 use TracerDef;
 set block XFILE_BLOCK_TEMP;
-set string name;
-set name name;
\ No newline at end of file
+set string name;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW4/XAssets/VehicleDef.txt b/src/ZoneCode/Game/IW4/XAssets/VehicleDef.txt
index ec44c85a..e7b46419 100644
--- a/src/ZoneCode/Game/IW4/XAssets/VehicleDef.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/VehicleDef.txt
@@ -4,7 +4,6 @@
 use VehicleDef;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set string useHintString;
 set string turretWeaponName;
 set scriptstring trophyTags;
diff --git a/src/ZoneCode/Game/IW4/XAssets/WeaponCompleteDef.txt b/src/ZoneCode/Game/IW4/XAssets/WeaponCompleteDef.txt
index 14ec6659..a2911b7f 100644
--- a/src/ZoneCode/Game/IW4/XAssets/WeaponCompleteDef.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/WeaponCompleteDef.txt
@@ -4,7 +4,6 @@
 use WeaponCompleteDef;
 set block XFILE_BLOCK_TEMP;
 set string szInternalName;
-set name szInternalName;
 set reusable weapDef;
 set string szDisplayName;
 set reusable hideTags;
diff --git a/src/ZoneCode/Game/IW4/XAssets/XAnimParts.txt b/src/ZoneCode/Game/IW4/XAssets/XAnimParts.txt
index 5e856218..8043d886 100644
--- a/src/ZoneCode/Game/IW4/XAssets/XAnimParts.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/XAnimParts.txt
@@ -4,7 +4,6 @@
 use XAnimParts;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set scriptstring names;
 set count names boneCount[9];
 set count notify notifyCount;
diff --git a/src/ZoneCode/Game/IW4/XAssets/XModel.txt b/src/ZoneCode/Game/IW4/XAssets/XModel.txt
index 74f6b7e5..6e499781 100644
--- a/src/ZoneCode/Game/IW4/XAssets/XModel.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/XModel.txt
@@ -4,7 +4,6 @@
 use XModel;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set scriptstring boneNames;
 set reusable boneNames;
 set count boneNames numBones;
diff --git a/src/ZoneCode/Game/IW4/XAssets/clipMap_t.txt b/src/ZoneCode/Game/IW4/XAssets/clipMap_t.txt
index f2636192..85c463ce 100644
--- a/src/ZoneCode/Game/IW4/XAssets/clipMap_t.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/clipMap_t.txt
@@ -4,7 +4,6 @@
 use clipMap_t;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set reusable planes;
 set count planes planeCount;
 set count staticModelList numStaticModels;
diff --git a/src/ZoneCode/Game/IW4/XAssets/menuDef_t.txt b/src/ZoneCode/Game/IW4/XAssets/menuDef_t.txt
index 98373980..daa252fd 100644
--- a/src/ZoneCode/Game/IW4/XAssets/menuDef_t.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/menuDef_t.txt
@@ -4,7 +4,6 @@
 use menuDef_t;
 set block XFILE_BLOCK_TEMP;
 set string window::name;
-set name window::name;
 set string font;
 set reusable visibleExp;
 set string allowedBinding;
diff --git a/src/ZoneCode/Game/IW4/XAssets/snd_alias_list_t.txt b/src/ZoneCode/Game/IW4/XAssets/snd_alias_list_t.txt
index 8558afc7..cddb8cbb 100644
--- a/src/ZoneCode/Game/IW4/XAssets/snd_alias_list_t.txt
+++ b/src/ZoneCode/Game/IW4/XAssets/snd_alias_list_t.txt
@@ -4,7 +4,6 @@
 use snd_alias_list_t;
 set block XFILE_BLOCK_TEMP;
 set string aliasName;
-set name aliasName;
 set reusable head;
 set count head count;
 
diff --git a/src/ZoneCode/Game/IW5/XAssets/AddonMapEnts.txt b/src/ZoneCode/Game/IW5/XAssets/AddonMapEnts.txt
index 2a8cc2d8..0131fb70 100644
--- a/src/ZoneCode/Game/IW5/XAssets/AddonMapEnts.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/AddonMapEnts.txt
@@ -4,7 +4,6 @@
 use AddonMapEnts;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count entityString numEntityChars;
 set reusable info;
 set count cmodels numSubModels;
diff --git a/src/ZoneCode/Game/IW5/XAssets/ComWorld.txt b/src/ZoneCode/Game/IW5/XAssets/ComWorld.txt
index 6bd5b8b9..4a9b9a3b 100644
--- a/src/ZoneCode/Game/IW5/XAssets/ComWorld.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/ComWorld.txt
@@ -4,7 +4,6 @@
 use ComWorld;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count primaryLights primaryLightCount;
 
 // ComPrimaryLight
diff --git a/src/ZoneCode/Game/IW5/XAssets/Font_s.txt b/src/ZoneCode/Game/IW5/XAssets/Font_s.txt
index f37cf707..dcc89931 100644
--- a/src/ZoneCode/Game/IW5/XAssets/Font_s.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/Font_s.txt
@@ -4,6 +4,5 @@
 use Font_s;
 set block XFILE_BLOCK_TEMP;
 set string fontName;
-set name fontName;
 set reusable glyphs;
 set count glyphs glyphCount;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW5/XAssets/FxEffectDef.txt b/src/ZoneCode/Game/IW5/XAssets/FxEffectDef.txt
index 96677815..2a83e44a 100644
--- a/src/ZoneCode/Game/IW5/XAssets/FxEffectDef.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/FxEffectDef.txt
@@ -4,7 +4,6 @@
 use FxEffectDef;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count elemDefs elemDefCountEmission + elemDefCountLooping + elemDefCountOneShot;
 
 // FxElemDef
diff --git a/src/ZoneCode/Game/IW5/XAssets/FxImpactTable.txt b/src/ZoneCode/Game/IW5/XAssets/FxImpactTable.txt
index 990b4fcc..350a4c84 100644
--- a/src/ZoneCode/Game/IW5/XAssets/FxImpactTable.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/FxImpactTable.txt
@@ -4,5 +4,4 @@
 use FxImpactTable;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count table 15;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW5/XAssets/FxWorld.txt b/src/ZoneCode/Game/IW5/XAssets/FxWorld.txt
index 8f20223e..c759103f 100644
--- a/src/ZoneCode/Game/IW5/XAssets/FxWorld.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/FxWorld.txt
@@ -4,7 +4,6 @@
 use FxWorld;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 
 // FxGlassSystem
 use FxGlassSystem;
diff --git a/src/ZoneCode/Game/IW5/XAssets/GfxImage.txt b/src/ZoneCode/Game/IW5/XAssets/GfxImage.txt
index 900e9ea3..f7fc37a0 100644
--- a/src/ZoneCode/Game/IW5/XAssets/GfxImage.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/GfxImage.txt
@@ -5,7 +5,6 @@ use GfxImage;
 set block XFILE_BLOCK_TEMP;
 set action OnImageLoaded(GfxImage);
 set string name;
-set name name;
 reorder:
     name
     texture;
diff --git a/src/ZoneCode/Game/IW5/XAssets/GfxLightDef.txt b/src/ZoneCode/Game/IW5/XAssets/GfxLightDef.txt
index ca07fc87..4a2ea7c6 100644
--- a/src/ZoneCode/Game/IW5/XAssets/GfxLightDef.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/GfxLightDef.txt
@@ -3,5 +3,4 @@
 // =========================================
 use GfxLightDef;
 set block XFILE_BLOCK_TEMP;
-set string name;
-set name name;
\ No newline at end of file
+set string name;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW5/XAssets/GfxWorld.txt b/src/ZoneCode/Game/IW5/XAssets/GfxWorld.txt
index ee043c2e..f2706a3d 100644
--- a/src/ZoneCode/Game/IW5/XAssets/GfxWorld.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/GfxWorld.txt
@@ -4,7 +4,6 @@
 use GfxWorld;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set string baseName;
 set count skies skyCount;
 set count aabbTreeCounts dpvsPlanes::cellCount;
diff --git a/src/ZoneCode/Game/IW5/XAssets/GlassWorld.txt b/src/ZoneCode/Game/IW5/XAssets/GlassWorld.txt
index c1f811db..1e525374 100644
--- a/src/ZoneCode/Game/IW5/XAssets/GlassWorld.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/GlassWorld.txt
@@ -4,7 +4,6 @@
 use GlassWorld;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 
 // G_GlassData
 use G_GlassData;
diff --git a/src/ZoneCode/Game/IW5/XAssets/LeaderboardDef.txt b/src/ZoneCode/Game/IW5/XAssets/LeaderboardDef.txt
index 8dd30900..cfc3c7f4 100644
--- a/src/ZoneCode/Game/IW5/XAssets/LeaderboardDef.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/LeaderboardDef.txt
@@ -4,7 +4,6 @@
 use LeaderboardDef;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count columns columnCount;
 
 // LbColumnDef
diff --git a/src/ZoneCode/Game/IW5/XAssets/LoadedSound.txt b/src/ZoneCode/Game/IW5/XAssets/LoadedSound.txt
index 0cef20e5..d9131522 100644
--- a/src/ZoneCode/Game/IW5/XAssets/LoadedSound.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/LoadedSound.txt
@@ -4,7 +4,6 @@
 use LoadedSound;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 
 // MssSound
 use MssSound;
diff --git a/src/ZoneCode/Game/IW5/XAssets/LocalizeEntry.txt b/src/ZoneCode/Game/IW5/XAssets/LocalizeEntry.txt
index a93f61b4..6b3d560e 100644
--- a/src/ZoneCode/Game/IW5/XAssets/LocalizeEntry.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/LocalizeEntry.txt
@@ -4,5 +4,4 @@
 use LocalizeEntry;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set string value;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW5/XAssets/MapEnts.txt b/src/ZoneCode/Game/IW5/XAssets/MapEnts.txt
index bfce39b2..f41da2a8 100644
--- a/src/ZoneCode/Game/IW5/XAssets/MapEnts.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/MapEnts.txt
@@ -4,7 +4,6 @@
 use MapEnts;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count entityString numEntityChars;
 
 // MapTriggers
diff --git a/src/ZoneCode/Game/IW5/XAssets/Material.txt b/src/ZoneCode/Game/IW5/XAssets/Material.txt
index df928d20..bc21dd4c 100644
--- a/src/ZoneCode/Game/IW5/XAssets/Material.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/Material.txt
@@ -4,7 +4,6 @@
 use Material;
 set block XFILE_BLOCK_TEMP;
 set string info::name;
-set name info::name;
 set reusable textureTable;
 set count textureTable textureCount;
 set reusable constantTable;
diff --git a/src/ZoneCode/Game/IW5/XAssets/MaterialPixelShader.txt b/src/ZoneCode/Game/IW5/XAssets/MaterialPixelShader.txt
index 76a69ebc..0cc485f6 100644
--- a/src/ZoneCode/Game/IW5/XAssets/MaterialPixelShader.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/MaterialPixelShader.txt
@@ -4,7 +4,6 @@
 use MaterialPixelShader;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 
 // GfxPixelShaderLoadDef
 set count GfxPixelShaderLoadDef::program programSize;
diff --git a/src/ZoneCode/Game/IW5/XAssets/MaterialTechniqueSet.txt b/src/ZoneCode/Game/IW5/XAssets/MaterialTechniqueSet.txt
index 1a6780c3..4769818a 100644
--- a/src/ZoneCode/Game/IW5/XAssets/MaterialTechniqueSet.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/MaterialTechniqueSet.txt
@@ -4,7 +4,6 @@
 use MaterialTechniqueSet;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set condition remappedTechniqueSet never;
 set reusable techniques;
 
diff --git a/src/ZoneCode/Game/IW5/XAssets/MaterialVertexDeclaration.txt b/src/ZoneCode/Game/IW5/XAssets/MaterialVertexDeclaration.txt
index fda4bd7a..9a848734 100644
--- a/src/ZoneCode/Game/IW5/XAssets/MaterialVertexDeclaration.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/MaterialVertexDeclaration.txt
@@ -4,7 +4,6 @@
 use MaterialVertexDeclaration;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 
 // MaterialVertexStreamRouting
 set condition MaterialVertexStreamRouting::decl never;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW5/XAssets/MaterialVertexShader.txt b/src/ZoneCode/Game/IW5/XAssets/MaterialVertexShader.txt
index c4731d45..434a4f84 100644
--- a/src/ZoneCode/Game/IW5/XAssets/MaterialVertexShader.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/MaterialVertexShader.txt
@@ -4,7 +4,6 @@
 use MaterialVertexShader;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 
 // GfxVertexShaderLoadDef
 set count GfxVertexShaderLoadDef::program programSize;
diff --git a/src/ZoneCode/Game/IW5/XAssets/MenuList.txt b/src/ZoneCode/Game/IW5/XAssets/MenuList.txt
index 5db2bd62..640e6160 100644
--- a/src/ZoneCode/Game/IW5/XAssets/MenuList.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/MenuList.txt
@@ -4,5 +4,4 @@
 use MenuList;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count menus menuCount;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW5/XAssets/PathData.txt b/src/ZoneCode/Game/IW5/XAssets/PathData.txt
index f00f5bc8..d3e07ce9 100644
--- a/src/ZoneCode/Game/IW5/XAssets/PathData.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/PathData.txt
@@ -4,7 +4,6 @@
 use PathData;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count nodes nodeCount;
 set block basenodes XFILE_BLOCK_RUNTIME;
 set count basenodes nodeCount;
diff --git a/src/ZoneCode/Game/IW5/XAssets/PhysCollmap.txt b/src/ZoneCode/Game/IW5/XAssets/PhysCollmap.txt
index 09f0540f..af947b2f 100644
--- a/src/ZoneCode/Game/IW5/XAssets/PhysCollmap.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/PhysCollmap.txt
@@ -4,7 +4,6 @@
 use PhysCollmap;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count geoms count;
 
 // PhysGeomInfo
diff --git a/src/ZoneCode/Game/IW5/XAssets/PhysPreset.txt b/src/ZoneCode/Game/IW5/XAssets/PhysPreset.txt
index 38346b9b..511d1189 100644
--- a/src/ZoneCode/Game/IW5/XAssets/PhysPreset.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/PhysPreset.txt
@@ -4,5 +4,4 @@
 use PhysPreset;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set string sndAliasPrefix;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW5/XAssets/RawFile.txt b/src/ZoneCode/Game/IW5/XAssets/RawFile.txt
index 2847e064..9b893a70 100644
--- a/src/ZoneCode/Game/IW5/XAssets/RawFile.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/RawFile.txt
@@ -4,5 +4,4 @@
 use RawFile;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count buffer compressedLen;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW5/XAssets/ScriptFile.txt b/src/ZoneCode/Game/IW5/XAssets/ScriptFile.txt
index 21664050..33e71470 100644
--- a/src/ZoneCode/Game/IW5/XAssets/ScriptFile.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/ScriptFile.txt
@@ -4,7 +4,6 @@
 use ScriptFile;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set block buffer XFILE_BLOCK_SCRIPT;
 set count buffer compressedLen;
 set block bytecode XFILE_BLOCK_SCRIPT;
diff --git a/src/ZoneCode/Game/IW5/XAssets/SndCurve.txt b/src/ZoneCode/Game/IW5/XAssets/SndCurve.txt
index 7c90a72a..9fa5f2da 100644
--- a/src/ZoneCode/Game/IW5/XAssets/SndCurve.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/SndCurve.txt
@@ -3,5 +3,4 @@
 // =========================================
 use SndCurve;
 set block XFILE_BLOCK_TEMP;
-set string filename;
-set name filename;
\ No newline at end of file
+set string filename;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW5/XAssets/StringTable.txt b/src/ZoneCode/Game/IW5/XAssets/StringTable.txt
index 7e818127..2850c319 100644
--- a/src/ZoneCode/Game/IW5/XAssets/StringTable.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/StringTable.txt
@@ -4,7 +4,6 @@
 use StringTable;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count values columnCount * rowCount;
 
 // StringTableCell
diff --git a/src/ZoneCode/Game/IW5/XAssets/StructuredDataDefSet.txt b/src/ZoneCode/Game/IW5/XAssets/StructuredDataDefSet.txt
index 44c21d4e..faf36599 100644
--- a/src/ZoneCode/Game/IW5/XAssets/StructuredDataDefSet.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/StructuredDataDefSet.txt
@@ -4,7 +4,6 @@
 use StructuredDataDefSet;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count defs defCount;
 
 // StructuredDataDef
diff --git a/src/ZoneCode/Game/IW5/XAssets/SurfaceFxTable.txt b/src/ZoneCode/Game/IW5/XAssets/SurfaceFxTable.txt
index bd557855..2aa18c88 100644
--- a/src/ZoneCode/Game/IW5/XAssets/SurfaceFxTable.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/SurfaceFxTable.txt
@@ -4,5 +4,4 @@
 use SurfaceFxTable;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count table 6;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW5/XAssets/TracerDef.txt b/src/ZoneCode/Game/IW5/XAssets/TracerDef.txt
index d51f996f..94508d6b 100644
--- a/src/ZoneCode/Game/IW5/XAssets/TracerDef.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/TracerDef.txt
@@ -3,5 +3,4 @@
 // =========================================
 use TracerDef;
 set block XFILE_BLOCK_TEMP;
-set string name;
-set name name;
\ No newline at end of file
+set string name;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW5/XAssets/VehicleDef.txt b/src/ZoneCode/Game/IW5/XAssets/VehicleDef.txt
index 11f494e2..40b60e22 100644
--- a/src/ZoneCode/Game/IW5/XAssets/VehicleDef.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/VehicleDef.txt
@@ -4,7 +4,6 @@
 use VehicleDef;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set string useHintString;
 set string turretWeaponName;
 set scriptstring trophyTags;
diff --git a/src/ZoneCode/Game/IW5/XAssets/VehicleTrack.txt b/src/ZoneCode/Game/IW5/XAssets/VehicleTrack.txt
index 4bcc09a3..2e2d0848 100644
--- a/src/ZoneCode/Game/IW5/XAssets/VehicleTrack.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/VehicleTrack.txt
@@ -4,7 +4,6 @@
 use VehicleTrack;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set reusable segments;
 set count segments segmentCount;
 
diff --git a/src/ZoneCode/Game/IW5/XAssets/WeaponAttachment.txt b/src/ZoneCode/Game/IW5/XAssets/WeaponAttachment.txt
index 9b85f993..b8e82d4f 100644
--- a/src/ZoneCode/Game/IW5/XAssets/WeaponAttachment.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/WeaponAttachment.txt
@@ -4,7 +4,6 @@
 use WeaponAttachment;
 set block XFILE_BLOCK_TEMP;
 set string szInternalName;
-set name szInternalName;
 set string szDisplayName;
 set reusable worldModels;
 set count worldModels 16;
diff --git a/src/ZoneCode/Game/IW5/XAssets/WeaponCompleteDef.txt b/src/ZoneCode/Game/IW5/XAssets/WeaponCompleteDef.txt
index 4a7a9617..6846512e 100644
--- a/src/ZoneCode/Game/IW5/XAssets/WeaponCompleteDef.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/WeaponCompleteDef.txt
@@ -4,7 +4,6 @@
 use WeaponCompleteDef;
 set block XFILE_BLOCK_TEMP;
 set string szInternalName;
-set name szInternalName;
 set reusable weapDef;
 set string szDisplayName;
 set reusable hideTags;
diff --git a/src/ZoneCode/Game/IW5/XAssets/XAnimParts.txt b/src/ZoneCode/Game/IW5/XAssets/XAnimParts.txt
index 5e856218..8043d886 100644
--- a/src/ZoneCode/Game/IW5/XAssets/XAnimParts.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/XAnimParts.txt
@@ -4,7 +4,6 @@
 use XAnimParts;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set scriptstring names;
 set count names boneCount[9];
 set count notify notifyCount;
diff --git a/src/ZoneCode/Game/IW5/XAssets/XModel.txt b/src/ZoneCode/Game/IW5/XAssets/XModel.txt
index 72a48947..dd2b1487 100644
--- a/src/ZoneCode/Game/IW5/XAssets/XModel.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/XModel.txt
@@ -4,7 +4,6 @@
 use XModel;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set scriptstring boneNames;
 set reusable boneNames;
 set count boneNames numBones;
diff --git a/src/ZoneCode/Game/IW5/XAssets/XModelSurfs.txt b/src/ZoneCode/Game/IW5/XAssets/XModelSurfs.txt
index 1e939bbf..8d986c70 100644
--- a/src/ZoneCode/Game/IW5/XAssets/XModelSurfs.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/XModelSurfs.txt
@@ -4,7 +4,6 @@
 use XModelSurfs;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count surfs numsurfs;
 
 // XSurface
diff --git a/src/ZoneCode/Game/IW5/XAssets/clipMap_t.txt b/src/ZoneCode/Game/IW5/XAssets/clipMap_t.txt
index 7b62a24d..6982e92c 100644
--- a/src/ZoneCode/Game/IW5/XAssets/clipMap_t.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/clipMap_t.txt
@@ -4,7 +4,6 @@
 use clipMap_t;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set block pInfo XFILE_BLOCK_TEMP;
 set reusable pInfo;
 set action pInfo ReallocClipInfo(ClipInfo, clipMap_t);
diff --git a/src/ZoneCode/Game/IW5/XAssets/menuDef_t.txt b/src/ZoneCode/Game/IW5/XAssets/menuDef_t.txt
index 3a8b9b2d..2cd444bd 100644
--- a/src/ZoneCode/Game/IW5/XAssets/menuDef_t.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/menuDef_t.txt
@@ -4,7 +4,6 @@
 use menuDef_t;
 set block XFILE_BLOCK_TEMP;
 set string window::name;
-set name window::name;
 set count items itemCount;
 
 // windowDef_t
diff --git a/src/ZoneCode/Game/IW5/XAssets/snd_alias_list_t.txt b/src/ZoneCode/Game/IW5/XAssets/snd_alias_list_t.txt
index 8558afc7..cddb8cbb 100644
--- a/src/ZoneCode/Game/IW5/XAssets/snd_alias_list_t.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/snd_alias_list_t.txt
@@ -4,7 +4,6 @@
 use snd_alias_list_t;
 set block XFILE_BLOCK_TEMP;
 set string aliasName;
-set name aliasName;
 set reusable head;
 set count head count;
 
diff --git a/src/ZoneCode/Game/T5/XAssets/ComWorld.txt b/src/ZoneCode/Game/T5/XAssets/ComWorld.txt
index 4d13305e..6029a4f7 100644
--- a/src/ZoneCode/Game/T5/XAssets/ComWorld.txt
+++ b/src/ZoneCode/Game/T5/XAssets/ComWorld.txt
@@ -4,7 +4,6 @@
 use ComWorld;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count primaryLights primaryLightCount;
 set count waterCells numWaterCells;
 set count burnableCells numBurnableCells;
diff --git a/src/ZoneCode/Game/T5/XAssets/DestructibleDef.txt b/src/ZoneCode/Game/T5/XAssets/DestructibleDef.txt
index 2060abe7..57b2e325 100644
--- a/src/ZoneCode/Game/T5/XAssets/DestructibleDef.txt
+++ b/src/ZoneCode/Game/T5/XAssets/DestructibleDef.txt
@@ -4,7 +4,6 @@
 use DestructibleDef;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count pieces numPieces;
 
 // DestructiblePiece
diff --git a/src/ZoneCode/Game/T5/XAssets/Font_s.txt b/src/ZoneCode/Game/T5/XAssets/Font_s.txt
index f37cf707..dcc89931 100644
--- a/src/ZoneCode/Game/T5/XAssets/Font_s.txt
+++ b/src/ZoneCode/Game/T5/XAssets/Font_s.txt
@@ -4,6 +4,5 @@
 use Font_s;
 set block XFILE_BLOCK_TEMP;
 set string fontName;
-set name fontName;
 set reusable glyphs;
 set count glyphs glyphCount;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T5/XAssets/FxEffectDef.txt b/src/ZoneCode/Game/T5/XAssets/FxEffectDef.txt
index 9a48c1fa..bd40a3ec 100644
--- a/src/ZoneCode/Game/T5/XAssets/FxEffectDef.txt
+++ b/src/ZoneCode/Game/T5/XAssets/FxEffectDef.txt
@@ -4,7 +4,6 @@
 use FxEffectDef;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count elemDefs elemDefCountLooping + elemDefCountOneShot + elemDefCountEmission;
 
 // FxElemDef
diff --git a/src/ZoneCode/Game/T5/XAssets/GameWorldMp.txt b/src/ZoneCode/Game/T5/XAssets/GameWorldMp.txt
index 27732a84..f93945f3 100644
--- a/src/ZoneCode/Game/T5/XAssets/GameWorldMp.txt
+++ b/src/ZoneCode/Game/T5/XAssets/GameWorldMp.txt
@@ -3,5 +3,4 @@
 // =========================================
 use GameWorldMp;
 set block XFILE_BLOCK_TEMP;
-set string name;
-set name name;
\ No newline at end of file
+set string name;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T5/XAssets/GameWorldSp.txt b/src/ZoneCode/Game/T5/XAssets/GameWorldSp.txt
index bf5ad36d..8cb8c289 100644
--- a/src/ZoneCode/Game/T5/XAssets/GameWorldSp.txt
+++ b/src/ZoneCode/Game/T5/XAssets/GameWorldSp.txt
@@ -4,7 +4,6 @@
 use GameWorldSp;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 
 // PathData
 use PathData;
diff --git a/src/ZoneCode/Game/T5/XAssets/GfxImage.txt b/src/ZoneCode/Game/T5/XAssets/GfxImage.txt
index 5a7260e1..adf2b4e1 100644
--- a/src/ZoneCode/Game/T5/XAssets/GfxImage.txt
+++ b/src/ZoneCode/Game/T5/XAssets/GfxImage.txt
@@ -5,7 +5,6 @@ use GfxImage;
 set block XFILE_BLOCK_TEMP;
 set action OnImageLoaded(GfxImage);
 set string name;
-set name name;
 set condition pixels never;
 reorder:
     name
diff --git a/src/ZoneCode/Game/T5/XAssets/GfxLightDef.txt b/src/ZoneCode/Game/T5/XAssets/GfxLightDef.txt
index ca07fc87..4a2ea7c6 100644
--- a/src/ZoneCode/Game/T5/XAssets/GfxLightDef.txt
+++ b/src/ZoneCode/Game/T5/XAssets/GfxLightDef.txt
@@ -3,5 +3,4 @@
 // =========================================
 use GfxLightDef;
 set block XFILE_BLOCK_TEMP;
-set string name;
-set name name;
\ No newline at end of file
+set string name;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T5/XAssets/GfxWorld.txt b/src/ZoneCode/Game/T5/XAssets/GfxWorld.txt
index d8d0c1cf..484f77cf 100644
--- a/src/ZoneCode/Game/T5/XAssets/GfxWorld.txt
+++ b/src/ZoneCode/Game/T5/XAssets/GfxWorld.txt
@@ -4,7 +4,6 @@
 use GfxWorld;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set string baseName;
 set count skyStartSurfs skySurfCount;
 set string skyBoxModel;
diff --git a/src/ZoneCode/Game/T5/XAssets/Glasses.txt b/src/ZoneCode/Game/T5/XAssets/Glasses.txt
index 8bbd95a4..4916885b 100644
--- a/src/ZoneCode/Game/T5/XAssets/Glasses.txt
+++ b/src/ZoneCode/Game/T5/XAssets/Glasses.txt
@@ -4,7 +4,6 @@
 use Glasses;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count glasses numGlasses;
 set condition workMemory never;
 
diff --git a/src/ZoneCode/Game/T5/XAssets/LocalizeEntry.txt b/src/ZoneCode/Game/T5/XAssets/LocalizeEntry.txt
index 6dc49902..359b9f22 100644
--- a/src/ZoneCode/Game/T5/XAssets/LocalizeEntry.txt
+++ b/src/ZoneCode/Game/T5/XAssets/LocalizeEntry.txt
@@ -4,5 +4,4 @@
 use LocalizeEntry;
 set block XFILE_BLOCK_TEMP;
 set string value;
-set string name;
-set name name;
\ No newline at end of file
+set string name;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T5/XAssets/MapEnts.txt b/src/ZoneCode/Game/T5/XAssets/MapEnts.txt
index 7540ff74..f5c82f08 100644
--- a/src/ZoneCode/Game/T5/XAssets/MapEnts.txt
+++ b/src/ZoneCode/Game/T5/XAssets/MapEnts.txt
@@ -4,5 +4,4 @@
 use MapEnts;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count entityString numEntityChars;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T5/XAssets/Material.txt b/src/ZoneCode/Game/T5/XAssets/Material.txt
index b0f52d34..d4ef7c6e 100644
--- a/src/ZoneCode/Game/T5/XAssets/Material.txt
+++ b/src/ZoneCode/Game/T5/XAssets/Material.txt
@@ -4,7 +4,6 @@
 use Material;
 set block XFILE_BLOCK_TEMP;
 set string info::name;
-set name info::name;
 set reusable textureTable;
 set count textureTable textureCount;
 set reusable constantTable;
diff --git a/src/ZoneCode/Game/T5/XAssets/MaterialTechniqueSet.txt b/src/ZoneCode/Game/T5/XAssets/MaterialTechniqueSet.txt
index c9ba1e54..e539d863 100644
--- a/src/ZoneCode/Game/T5/XAssets/MaterialTechniqueSet.txt
+++ b/src/ZoneCode/Game/T5/XAssets/MaterialTechniqueSet.txt
@@ -4,7 +4,6 @@
 use MaterialTechniqueSet;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set reusable techniques;
 
 // MaterialTechnique
diff --git a/src/ZoneCode/Game/T5/XAssets/MenuList.txt b/src/ZoneCode/Game/T5/XAssets/MenuList.txt
index 5db2bd62..640e6160 100644
--- a/src/ZoneCode/Game/T5/XAssets/MenuList.txt
+++ b/src/ZoneCode/Game/T5/XAssets/MenuList.txt
@@ -4,5 +4,4 @@
 use MenuList;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count menus menuCount;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T5/XAssets/PackIndex.txt b/src/ZoneCode/Game/T5/XAssets/PackIndex.txt
index 017d6922..78947af9 100644
--- a/src/ZoneCode/Game/T5/XAssets/PackIndex.txt
+++ b/src/ZoneCode/Game/T5/XAssets/PackIndex.txt
@@ -4,5 +4,4 @@
 use PackIndex;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count entries header::count;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T5/XAssets/PhysConstraints.txt b/src/ZoneCode/Game/T5/XAssets/PhysConstraints.txt
index 6a476b3e..bbf65f95 100644
--- a/src/ZoneCode/Game/T5/XAssets/PhysConstraints.txt
+++ b/src/ZoneCode/Game/T5/XAssets/PhysConstraints.txt
@@ -4,7 +4,6 @@
 use PhysConstraints;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 
 use PhysConstraint;
 set scriptstring targetname;
diff --git a/src/ZoneCode/Game/T5/XAssets/PhysPreset.txt b/src/ZoneCode/Game/T5/XAssets/PhysPreset.txt
index 38346b9b..511d1189 100644
--- a/src/ZoneCode/Game/T5/XAssets/PhysPreset.txt
+++ b/src/ZoneCode/Game/T5/XAssets/PhysPreset.txt
@@ -4,5 +4,4 @@
 use PhysPreset;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set string sndAliasPrefix;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T5/XAssets/RawFile.txt b/src/ZoneCode/Game/T5/XAssets/RawFile.txt
index 29e05132..befbf1ec 100644
--- a/src/ZoneCode/Game/T5/XAssets/RawFile.txt
+++ b/src/ZoneCode/Game/T5/XAssets/RawFile.txt
@@ -4,5 +4,4 @@
 use RawFile;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count buffer len + 1;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T5/XAssets/SndBank.txt b/src/ZoneCode/Game/T5/XAssets/SndBank.txt
index 3ea395a1..52278589 100644
--- a/src/ZoneCode/Game/T5/XAssets/SndBank.txt
+++ b/src/ZoneCode/Game/T5/XAssets/SndBank.txt
@@ -4,7 +4,6 @@
 use SndBank;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count alias aliasCount;
 set count aliasIndex aliasCount;
 set count radverbs radverbCount;
diff --git a/src/ZoneCode/Game/T5/XAssets/SndDriverGlobals.txt b/src/ZoneCode/Game/T5/XAssets/SndDriverGlobals.txt
index 519de90b..a59bbad4 100644
--- a/src/ZoneCode/Game/T5/XAssets/SndDriverGlobals.txt
+++ b/src/ZoneCode/Game/T5/XAssets/SndDriverGlobals.txt
@@ -4,7 +4,6 @@
 use SndDriverGlobals;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count groups groupCount;
 set count curves curveCount;
 set count pans panCount;
diff --git a/src/ZoneCode/Game/T5/XAssets/SndPatch.txt b/src/ZoneCode/Game/T5/XAssets/SndPatch.txt
index b85ad1a6..b79ff74f 100644
--- a/src/ZoneCode/Game/T5/XAssets/SndPatch.txt
+++ b/src/ZoneCode/Game/T5/XAssets/SndPatch.txt
@@ -4,7 +4,6 @@
 use SndPatch;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count elements elementCount;
 set count files fileCount;
 set reusable files;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T5/XAssets/StringTable.txt b/src/ZoneCode/Game/T5/XAssets/StringTable.txt
index b1b5e1ac..427272b4 100644
--- a/src/ZoneCode/Game/T5/XAssets/StringTable.txt
+++ b/src/ZoneCode/Game/T5/XAssets/StringTable.txt
@@ -4,7 +4,6 @@
 use StringTable;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count values columnCount * rowCount;
 set count cellIndex columnCount * rowCount;
 
diff --git a/src/ZoneCode/Game/T5/XAssets/WeaponVariantDef.txt b/src/ZoneCode/Game/T5/XAssets/WeaponVariantDef.txt
index 50bc2ffa..fb15e40f 100644
--- a/src/ZoneCode/Game/T5/XAssets/WeaponVariantDef.txt
+++ b/src/ZoneCode/Game/T5/XAssets/WeaponVariantDef.txt
@@ -4,7 +4,6 @@
 use WeaponVariantDef;
 set block XFILE_BLOCK_TEMP;
 set string szInternalName;
-set name szInternalName;
 set reusable weapDef;
 set string szDisplayName;
 set string szAltWeaponName;
diff --git a/src/ZoneCode/Game/T5/XAssets/XAnimParts.txt b/src/ZoneCode/Game/T5/XAssets/XAnimParts.txt
index 529f3cab..52c89d2f 100644
--- a/src/ZoneCode/Game/T5/XAssets/XAnimParts.txt
+++ b/src/ZoneCode/Game/T5/XAssets/XAnimParts.txt
@@ -4,7 +4,6 @@
 use XAnimParts;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set scriptstring names;
 set count names boneCount[9];
 set count notify notifyCount;
diff --git a/src/ZoneCode/Game/T5/XAssets/XGlobals.txt b/src/ZoneCode/Game/T5/XAssets/XGlobals.txt
index 76653d91..ad02f864 100644
--- a/src/ZoneCode/Game/T5/XAssets/XGlobals.txt
+++ b/src/ZoneCode/Game/T5/XAssets/XGlobals.txt
@@ -3,5 +3,4 @@
 // =========================================
 use XGlobals;
 set block XFILE_BLOCK_TEMP;
-set string name;
-set name name;
\ No newline at end of file
+set string name;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T5/XAssets/XModel.txt b/src/ZoneCode/Game/T5/XAssets/XModel.txt
index b555fad6..5fb77308 100644
--- a/src/ZoneCode/Game/T5/XAssets/XModel.txt
+++ b/src/ZoneCode/Game/T5/XAssets/XModel.txt
@@ -4,7 +4,6 @@
 use XModel;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set scriptstring boneNames;
 set reusable boneNames;
 set count boneNames numBones;
diff --git a/src/ZoneCode/Game/T5/XAssets/clipMap_t.txt b/src/ZoneCode/Game/T5/XAssets/clipMap_t.txt
index 10dc3505..9f29bec9 100644
--- a/src/ZoneCode/Game/T5/XAssets/clipMap_t.txt
+++ b/src/ZoneCode/Game/T5/XAssets/clipMap_t.txt
@@ -4,7 +4,6 @@
 use clipMap_t;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set reusable planes;
 set count planes planeCount;
 set count staticModelList numStaticModels;
@@ -82,5 +81,4 @@ set scriptstring target;
 // XModelPieces
 use XModelPieces;
 set string name;
-set name name;
 set count pieces numpieces;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T5/XAssets/ddlRoot_t.txt b/src/ZoneCode/Game/T5/XAssets/ddlRoot_t.txt
index c28279f3..a453c8fe 100644
--- a/src/ZoneCode/Game/T5/XAssets/ddlRoot_t.txt
+++ b/src/ZoneCode/Game/T5/XAssets/ddlRoot_t.txt
@@ -4,7 +4,6 @@
 use ddlRoot_t;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count ddlDef 1;
 
 // ddlDef_t
diff --git a/src/ZoneCode/Game/T5/XAssets/menuDef_t.txt b/src/ZoneCode/Game/T5/XAssets/menuDef_t.txt
index 2c2e621d..1fbf9563 100644
--- a/src/ZoneCode/Game/T5/XAssets/menuDef_t.txt
+++ b/src/ZoneCode/Game/T5/XAssets/menuDef_t.txt
@@ -4,7 +4,6 @@
 use menuDef_t;
 set block XFILE_BLOCK_TEMP;
 set string window::name;
-set name window::name;
 set string font;
 set string allowedBinding;
 set string soundName;
diff --git a/src/ZoneCode/Game/T6/XAssets/AddonMapEnts.txt b/src/ZoneCode/Game/T6/XAssets/AddonMapEnts.txt
index bc95797f..3be649e3 100644
--- a/src/ZoneCode/Game/T6/XAssets/AddonMapEnts.txt
+++ b/src/ZoneCode/Game/T6/XAssets/AddonMapEnts.txt
@@ -4,7 +4,6 @@
 use AddonMapEnts;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count entityString numEntityChars;
 set reusable info;
 set count cmodels numSubModels;
diff --git a/src/ZoneCode/Game/T6/XAssets/ComWorld.txt b/src/ZoneCode/Game/T6/XAssets/ComWorld.txt
index 6bd5b8b9..4a9b9a3b 100644
--- a/src/ZoneCode/Game/T6/XAssets/ComWorld.txt
+++ b/src/ZoneCode/Game/T6/XAssets/ComWorld.txt
@@ -4,7 +4,6 @@
 use ComWorld;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count primaryLights primaryLightCount;
 
 // ComPrimaryLight
diff --git a/src/ZoneCode/Game/T6/XAssets/DestructibleDef.txt b/src/ZoneCode/Game/T6/XAssets/DestructibleDef.txt
index 2060abe7..57b2e325 100644
--- a/src/ZoneCode/Game/T6/XAssets/DestructibleDef.txt
+++ b/src/ZoneCode/Game/T6/XAssets/DestructibleDef.txt
@@ -4,7 +4,6 @@
 use DestructibleDef;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count pieces numPieces;
 
 // DestructiblePiece
diff --git a/src/ZoneCode/Game/T6/XAssets/FontIcon.txt b/src/ZoneCode/Game/T6/XAssets/FontIcon.txt
index f292f486..8df412e5 100644
--- a/src/ZoneCode/Game/T6/XAssets/FontIcon.txt
+++ b/src/ZoneCode/Game/T6/XAssets/FontIcon.txt
@@ -4,7 +4,6 @@
 use FontIcon;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set reusable fontIconEntry;
 set count fontIconEntry numEntries;
 set reusable fontIconAlias;
diff --git a/src/ZoneCode/Game/T6/XAssets/Font_s.txt b/src/ZoneCode/Game/T6/XAssets/Font_s.txt
index 73809f62..e89a4b5f 100644
--- a/src/ZoneCode/Game/T6/XAssets/Font_s.txt
+++ b/src/ZoneCode/Game/T6/XAssets/Font_s.txt
@@ -4,7 +4,6 @@
 use Font_s;
 set block XFILE_BLOCK_TEMP;
 set string fontName;
-set name fontName;
 set reusable glyphs;
 set count glyphs glyphCount;
 set reusable kerningPairs;
diff --git a/src/ZoneCode/Game/T6/XAssets/FootstepFXTableDef.txt b/src/ZoneCode/Game/T6/XAssets/FootstepFXTableDef.txt
index 90463815..30b2194b 100644
--- a/src/ZoneCode/Game/T6/XAssets/FootstepFXTableDef.txt
+++ b/src/ZoneCode/Game/T6/XAssets/FootstepFXTableDef.txt
@@ -3,5 +3,4 @@
 // =========================================
 use FootstepFXTableDef;
 set block XFILE_BLOCK_TEMP;
-set string name;
-set name name;
\ No newline at end of file
+set string name;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T6/XAssets/FootstepTableDef.txt b/src/ZoneCode/Game/T6/XAssets/FootstepTableDef.txt
index d8942f86..6ed483aa 100644
--- a/src/ZoneCode/Game/T6/XAssets/FootstepTableDef.txt
+++ b/src/ZoneCode/Game/T6/XAssets/FootstepTableDef.txt
@@ -3,5 +3,4 @@
 // =========================================
 use FootstepTableDef;
 set block XFILE_BLOCK_TEMP;
-set string name;
-set name name;
\ No newline at end of file
+set string name;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T6/XAssets/FxEffectDef.txt b/src/ZoneCode/Game/T6/XAssets/FxEffectDef.txt
index 57043d46..0009e0d5 100644
--- a/src/ZoneCode/Game/T6/XAssets/FxEffectDef.txt
+++ b/src/ZoneCode/Game/T6/XAssets/FxEffectDef.txt
@@ -4,7 +4,6 @@
 use FxEffectDef;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count elemDefs elemDefCountLooping + elemDefCountOneShot + elemDefCountEmission;
 
 // FxElemDef
diff --git a/src/ZoneCode/Game/T6/XAssets/GameWorldMp.txt b/src/ZoneCode/Game/T6/XAssets/GameWorldMp.txt
index 27732a84..f93945f3 100644
--- a/src/ZoneCode/Game/T6/XAssets/GameWorldMp.txt
+++ b/src/ZoneCode/Game/T6/XAssets/GameWorldMp.txt
@@ -3,5 +3,4 @@
 // =========================================
 use GameWorldMp;
 set block XFILE_BLOCK_TEMP;
-set string name;
-set name name;
\ No newline at end of file
+set string name;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T6/XAssets/GameWorldSp.txt b/src/ZoneCode/Game/T6/XAssets/GameWorldSp.txt
index 0a8a6a67..6c9d8854 100644
--- a/src/ZoneCode/Game/T6/XAssets/GameWorldSp.txt
+++ b/src/ZoneCode/Game/T6/XAssets/GameWorldSp.txt
@@ -4,7 +4,6 @@
 use GameWorldSp;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 
 // PathData
 use PathData;
diff --git a/src/ZoneCode/Game/T6/XAssets/GfxImage.txt b/src/ZoneCode/Game/T6/XAssets/GfxImage.txt
index 0fd5ede5..a93d8b1f 100644
--- a/src/ZoneCode/Game/T6/XAssets/GfxImage.txt
+++ b/src/ZoneCode/Game/T6/XAssets/GfxImage.txt
@@ -5,7 +5,6 @@ use GfxImage;
 set block XFILE_BLOCK_TEMP;
 set action OnImageLoaded(GfxImage);
 set string name;
-set name name;
 set condition pixels never;
 reorder:
     name
diff --git a/src/ZoneCode/Game/T6/XAssets/GfxLightDef.txt b/src/ZoneCode/Game/T6/XAssets/GfxLightDef.txt
index ca07fc87..4a2ea7c6 100644
--- a/src/ZoneCode/Game/T6/XAssets/GfxLightDef.txt
+++ b/src/ZoneCode/Game/T6/XAssets/GfxLightDef.txt
@@ -3,5 +3,4 @@
 // =========================================
 use GfxLightDef;
 set block XFILE_BLOCK_TEMP;
-set string name;
-set name name;
\ No newline at end of file
+set string name;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T6/XAssets/GfxWorld.txt b/src/ZoneCode/Game/T6/XAssets/GfxWorld.txt
index f2d16c27..f5b70587 100644
--- a/src/ZoneCode/Game/T6/XAssets/GfxWorld.txt
+++ b/src/ZoneCode/Game/T6/XAssets/GfxWorld.txt
@@ -4,7 +4,6 @@
 use GfxWorld;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set string baseName;
 set string skyBoxModel;
 set reusable sunLight;
diff --git a/src/ZoneCode/Game/T6/XAssets/Glasses.txt b/src/ZoneCode/Game/T6/XAssets/Glasses.txt
index 8bbd95a4..4916885b 100644
--- a/src/ZoneCode/Game/T6/XAssets/Glasses.txt
+++ b/src/ZoneCode/Game/T6/XAssets/Glasses.txt
@@ -4,7 +4,6 @@
 use Glasses;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count glasses numGlasses;
 set condition workMemory never;
 
diff --git a/src/ZoneCode/Game/T6/XAssets/KeyValuePairs.txt b/src/ZoneCode/Game/T6/XAssets/KeyValuePairs.txt
index 37c69fab..6bb395aa 100644
--- a/src/ZoneCode/Game/T6/XAssets/KeyValuePairs.txt
+++ b/src/ZoneCode/Game/T6/XAssets/KeyValuePairs.txt
@@ -4,7 +4,6 @@
 use KeyValuePairs;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count keyValuePairs numVariables;
 
 // KeyValuePair
diff --git a/src/ZoneCode/Game/T6/XAssets/LeaderboardDef.txt b/src/ZoneCode/Game/T6/XAssets/LeaderboardDef.txt
index 5137b1c1..5229d460 100644
--- a/src/ZoneCode/Game/T6/XAssets/LeaderboardDef.txt
+++ b/src/ZoneCode/Game/T6/XAssets/LeaderboardDef.txt
@@ -4,7 +4,6 @@
 use LeaderboardDef;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count columns columnCount;
 
 // LbColumnDef
diff --git a/src/ZoneCode/Game/T6/XAssets/LocalizeEntry.txt b/src/ZoneCode/Game/T6/XAssets/LocalizeEntry.txt
index 6dc49902..359b9f22 100644
--- a/src/ZoneCode/Game/T6/XAssets/LocalizeEntry.txt
+++ b/src/ZoneCode/Game/T6/XAssets/LocalizeEntry.txt
@@ -4,5 +4,4 @@
 use LocalizeEntry;
 set block XFILE_BLOCK_TEMP;
 set string value;
-set string name;
-set name name;
\ No newline at end of file
+set string name;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T6/XAssets/MapEnts.txt b/src/ZoneCode/Game/T6/XAssets/MapEnts.txt
index e7ccb22a..9651d4df 100644
--- a/src/ZoneCode/Game/T6/XAssets/MapEnts.txt
+++ b/src/ZoneCode/Game/T6/XAssets/MapEnts.txt
@@ -4,7 +4,6 @@
 use MapEnts;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count entityString numEntityChars;
 
 // MapTriggers
diff --git a/src/ZoneCode/Game/T6/XAssets/Material.txt b/src/ZoneCode/Game/T6/XAssets/Material.txt
index 367a82e6..64b96ca3 100644
--- a/src/ZoneCode/Game/T6/XAssets/Material.txt
+++ b/src/ZoneCode/Game/T6/XAssets/Material.txt
@@ -4,7 +4,6 @@
 use Material;
 set block XFILE_BLOCK_TEMP;
 set string info::name;
-set name info::name;
 set reusable textureTable;
 set count textureTable textureCount;
 set reusable constantTable;
diff --git a/src/ZoneCode/Game/T6/XAssets/MaterialTechniqueSet.txt b/src/ZoneCode/Game/T6/XAssets/MaterialTechniqueSet.txt
index 544e056f..92a9f878 100644
--- a/src/ZoneCode/Game/T6/XAssets/MaterialTechniqueSet.txt
+++ b/src/ZoneCode/Game/T6/XAssets/MaterialTechniqueSet.txt
@@ -4,7 +4,6 @@
 use MaterialTechniqueSet;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set reusable techniques;
 
 // MaterialTechnique
diff --git a/src/ZoneCode/Game/T6/XAssets/MemoryBlock.txt b/src/ZoneCode/Game/T6/XAssets/MemoryBlock.txt
index 00c9fd64..f17888e8 100644
--- a/src/ZoneCode/Game/T6/XAssets/MemoryBlock.txt
+++ b/src/ZoneCode/Game/T6/XAssets/MemoryBlock.txt
@@ -4,7 +4,6 @@
 use MemoryBlock;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 
 set condition data::mainData mainMem;
 set count data::mainData size;
diff --git a/src/ZoneCode/Game/T6/XAssets/MenuList.txt b/src/ZoneCode/Game/T6/XAssets/MenuList.txt
index 5db2bd62..640e6160 100644
--- a/src/ZoneCode/Game/T6/XAssets/MenuList.txt
+++ b/src/ZoneCode/Game/T6/XAssets/MenuList.txt
@@ -4,5 +4,4 @@
 use MenuList;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count menus menuCount;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T6/XAssets/PhysConstraints.txt b/src/ZoneCode/Game/T6/XAssets/PhysConstraints.txt
index 6a476b3e..bbf65f95 100644
--- a/src/ZoneCode/Game/T6/XAssets/PhysConstraints.txt
+++ b/src/ZoneCode/Game/T6/XAssets/PhysConstraints.txt
@@ -4,7 +4,6 @@
 use PhysConstraints;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 
 use PhysConstraint;
 set scriptstring targetname;
diff --git a/src/ZoneCode/Game/T6/XAssets/PhysPreset.txt b/src/ZoneCode/Game/T6/XAssets/PhysPreset.txt
index 38346b9b..511d1189 100644
--- a/src/ZoneCode/Game/T6/XAssets/PhysPreset.txt
+++ b/src/ZoneCode/Game/T6/XAssets/PhysPreset.txt
@@ -4,5 +4,4 @@
 use PhysPreset;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set string sndAliasPrefix;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T6/XAssets/Qdb.txt b/src/ZoneCode/Game/T6/XAssets/Qdb.txt
index 4f7d87cc..02701154 100644
--- a/src/ZoneCode/Game/T6/XAssets/Qdb.txt
+++ b/src/ZoneCode/Game/T6/XAssets/Qdb.txt
@@ -4,5 +4,4 @@
 use Qdb;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count buffer len + 1;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T6/XAssets/RawFile.txt b/src/ZoneCode/Game/T6/XAssets/RawFile.txt
index 29e05132..befbf1ec 100644
--- a/src/ZoneCode/Game/T6/XAssets/RawFile.txt
+++ b/src/ZoneCode/Game/T6/XAssets/RawFile.txt
@@ -4,5 +4,4 @@
 use RawFile;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count buffer len + 1;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T6/XAssets/ScriptParseTree.txt b/src/ZoneCode/Game/T6/XAssets/ScriptParseTree.txt
index d5b933eb..317c83f0 100644
--- a/src/ZoneCode/Game/T6/XAssets/ScriptParseTree.txt
+++ b/src/ZoneCode/Game/T6/XAssets/ScriptParseTree.txt
@@ -4,5 +4,4 @@
 use ScriptParseTree;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count buffer len + 1;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T6/XAssets/SkinnedVertsDef.txt b/src/ZoneCode/Game/T6/XAssets/SkinnedVertsDef.txt
index e0b19d50..9ce14dbf 100644
--- a/src/ZoneCode/Game/T6/XAssets/SkinnedVertsDef.txt
+++ b/src/ZoneCode/Game/T6/XAssets/SkinnedVertsDef.txt
@@ -3,5 +3,4 @@
 // =========================================
 use SkinnedVertsDef;
 set block XFILE_BLOCK_TEMP;
-set string name;
-set name name;
\ No newline at end of file
+set string name;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T6/XAssets/Slug.txt b/src/ZoneCode/Game/T6/XAssets/Slug.txt
index 049159c6..67b74247 100644
--- a/src/ZoneCode/Game/T6/XAssets/Slug.txt
+++ b/src/ZoneCode/Game/T6/XAssets/Slug.txt
@@ -4,5 +4,4 @@
 use Slug;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count buffer len + 1;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T6/XAssets/SndBank.txt b/src/ZoneCode/Game/T6/XAssets/SndBank.txt
index 79da365c..286735f9 100644
--- a/src/ZoneCode/Game/T6/XAssets/SndBank.txt
+++ b/src/ZoneCode/Game/T6/XAssets/SndBank.txt
@@ -4,7 +4,6 @@
 use SndBank;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count alias aliasCount;
 set count aliasIndex aliasCount;
 set count radverbs radverbCount;
diff --git a/src/ZoneCode/Game/T6/XAssets/SndDriverGlobals.txt b/src/ZoneCode/Game/T6/XAssets/SndDriverGlobals.txt
index eee19c7b..d8bf9b62 100644
--- a/src/ZoneCode/Game/T6/XAssets/SndDriverGlobals.txt
+++ b/src/ZoneCode/Game/T6/XAssets/SndDriverGlobals.txt
@@ -4,7 +4,6 @@
 use SndDriverGlobals;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count groups groupCount;
 set count curves curveCount;
 set count pans panCount;
diff --git a/src/ZoneCode/Game/T6/XAssets/SndPatch.txt b/src/ZoneCode/Game/T6/XAssets/SndPatch.txt
index 9dee7c8f..61ca520b 100644
--- a/src/ZoneCode/Game/T6/XAssets/SndPatch.txt
+++ b/src/ZoneCode/Game/T6/XAssets/SndPatch.txt
@@ -4,5 +4,4 @@
 use SndPatch;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count elements elementCount;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T6/XAssets/StringTable.txt b/src/ZoneCode/Game/T6/XAssets/StringTable.txt
index b1b5e1ac..427272b4 100644
--- a/src/ZoneCode/Game/T6/XAssets/StringTable.txt
+++ b/src/ZoneCode/Game/T6/XAssets/StringTable.txt
@@ -4,7 +4,6 @@
 use StringTable;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count values columnCount * rowCount;
 set count cellIndex columnCount * rowCount;
 
diff --git a/src/ZoneCode/Game/T6/XAssets/TracerDef.txt b/src/ZoneCode/Game/T6/XAssets/TracerDef.txt
index d51f996f..94508d6b 100644
--- a/src/ZoneCode/Game/T6/XAssets/TracerDef.txt
+++ b/src/ZoneCode/Game/T6/XAssets/TracerDef.txt
@@ -3,5 +3,4 @@
 // =========================================
 use TracerDef;
 set block XFILE_BLOCK_TEMP;
-set string name;
-set name name;
\ No newline at end of file
+set string name;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T6/XAssets/VehicleDef.txt b/src/ZoneCode/Game/T6/XAssets/VehicleDef.txt
index edeef39c..93e5b941 100644
--- a/src/ZoneCode/Game/T6/XAssets/VehicleDef.txt
+++ b/src/ZoneCode/Game/T6/XAssets/VehicleDef.txt
@@ -4,7 +4,6 @@
 use VehicleDef;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set string turretWeapon;
 set string gunnerWeapon;
 set string sndNames;
diff --git a/src/ZoneCode/Game/T6/XAssets/WeaponAttachment.txt b/src/ZoneCode/Game/T6/XAssets/WeaponAttachment.txt
index 65d388f0..78770b2b 100644
--- a/src/ZoneCode/Game/T6/XAssets/WeaponAttachment.txt
+++ b/src/ZoneCode/Game/T6/XAssets/WeaponAttachment.txt
@@ -4,5 +4,4 @@
 use WeaponAttachment;
 set block XFILE_BLOCK_TEMP;
 set string szInternalName;
-set name szInternalName;
 set string szDisplayName;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T6/XAssets/WeaponAttachmentUnique.txt b/src/ZoneCode/Game/T6/XAssets/WeaponAttachmentUnique.txt
index 1667fe85..4fd2b883 100644
--- a/src/ZoneCode/Game/T6/XAssets/WeaponAttachmentUnique.txt
+++ b/src/ZoneCode/Game/T6/XAssets/WeaponAttachmentUnique.txt
@@ -4,7 +4,6 @@
 use WeaponAttachmentUnique;
 set block XFILE_BLOCK_TEMP;
 set string szInternalName;
-set name szInternalName;
 set string szAltWeaponName;
 set string szDualWieldWeaponName;
 set scriptstring hideTags;
diff --git a/src/ZoneCode/Game/T6/XAssets/WeaponCamo.txt b/src/ZoneCode/Game/T6/XAssets/WeaponCamo.txt
index db426441..f247c914 100644
--- a/src/ZoneCode/Game/T6/XAssets/WeaponCamo.txt
+++ b/src/ZoneCode/Game/T6/XAssets/WeaponCamo.txt
@@ -4,7 +4,6 @@
 use WeaponCamo;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count camoSets numCamoSets;
 set count camoMaterials numCamoMaterials;
 
diff --git a/src/ZoneCode/Game/T6/XAssets/WeaponVariantDef.txt b/src/ZoneCode/Game/T6/XAssets/WeaponVariantDef.txt
index 05b8e41a..610d37ab 100644
--- a/src/ZoneCode/Game/T6/XAssets/WeaponVariantDef.txt
+++ b/src/ZoneCode/Game/T6/XAssets/WeaponVariantDef.txt
@@ -4,7 +4,6 @@
 use WeaponVariantDef;
 set block XFILE_BLOCK_TEMP;
 set string szInternalName;
-set name szInternalName;
 set reusable weapDef;
 set string szDisplayName;
 set string szAltWeaponName;
diff --git a/src/ZoneCode/Game/T6/XAssets/XAnimParts.txt b/src/ZoneCode/Game/T6/XAssets/XAnimParts.txt
index 5e856218..8043d886 100644
--- a/src/ZoneCode/Game/T6/XAssets/XAnimParts.txt
+++ b/src/ZoneCode/Game/T6/XAssets/XAnimParts.txt
@@ -4,7 +4,6 @@
 use XAnimParts;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set scriptstring names;
 set count names boneCount[9];
 set count notify notifyCount;
diff --git a/src/ZoneCode/Game/T6/XAssets/XGlobals.txt b/src/ZoneCode/Game/T6/XAssets/XGlobals.txt
index 96361b03..be770980 100644
--- a/src/ZoneCode/Game/T6/XAssets/XGlobals.txt
+++ b/src/ZoneCode/Game/T6/XAssets/XGlobals.txt
@@ -4,7 +4,6 @@
 use XGlobals;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set arraycount gumps gumpsCount;
 set condition gumps gumpsCount >= 0 && gumpsCount <= 32;
 set arraycount overlays overlayCount;
diff --git a/src/ZoneCode/Game/T6/XAssets/XModel.txt b/src/ZoneCode/Game/T6/XAssets/XModel.txt
index 62cd446a..989fec8b 100644
--- a/src/ZoneCode/Game/T6/XAssets/XModel.txt
+++ b/src/ZoneCode/Game/T6/XAssets/XModel.txt
@@ -4,7 +4,6 @@
 use XModel;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set scriptstring boneNames;
 set reusable boneNames;
 set count boneNames numBones;
diff --git a/src/ZoneCode/Game/T6/XAssets/ZBarrierDef.txt b/src/ZoneCode/Game/T6/XAssets/ZBarrierDef.txt
index d903bbec..7c31eb70 100644
--- a/src/ZoneCode/Game/T6/XAssets/ZBarrierDef.txt
+++ b/src/ZoneCode/Game/T6/XAssets/ZBarrierDef.txt
@@ -4,7 +4,6 @@
 use ZBarrierDef;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set scriptstring zombieTauntAnimState;
 set scriptstring zombieReachThroughAnimState;
 
diff --git a/src/ZoneCode/Game/T6/XAssets/clipMap_t.txt b/src/ZoneCode/Game/T6/XAssets/clipMap_t.txt
index ab35cc83..2ab5e245 100644
--- a/src/ZoneCode/Game/T6/XAssets/clipMap_t.txt
+++ b/src/ZoneCode/Game/T6/XAssets/clipMap_t.txt
@@ -4,7 +4,6 @@
 use clipMap_t;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set block pInfo XFILE_BLOCK_TEMP;
 set reusable pInfo;
 set count staticModelList numStaticModels;
@@ -93,5 +92,4 @@ set scriptstring target;
 // XModelPieces
 use XModelPieces;
 set string name;
-set name name;
 set count pieces numpieces;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/T6/XAssets/ddlRoot_t.txt b/src/ZoneCode/Game/T6/XAssets/ddlRoot_t.txt
index aeb44d56..8897441f 100644
--- a/src/ZoneCode/Game/T6/XAssets/ddlRoot_t.txt
+++ b/src/ZoneCode/Game/T6/XAssets/ddlRoot_t.txt
@@ -4,7 +4,6 @@
 use ddlRoot_t;
 set block XFILE_BLOCK_TEMP;
 set string name;
-set name name;
 set count ddlDef 1;
 
 // ddlDef_t
diff --git a/src/ZoneCode/Game/T6/XAssets/menuDef_t.txt b/src/ZoneCode/Game/T6/XAssets/menuDef_t.txt
index b8ac0079..e64adf47 100644
--- a/src/ZoneCode/Game/T6/XAssets/menuDef_t.txt
+++ b/src/ZoneCode/Game/T6/XAssets/menuDef_t.txt
@@ -4,7 +4,6 @@
 use menuDef_t;
 set block XFILE_BLOCK_TEMP;
 set string window::name;
-set name window::name;
 set string font;
 set string allowedBinding;
 set string soundName;
diff --git a/src/ZoneCodeGeneratorLib/Domain/Information/StructureInformation.h b/src/ZoneCodeGeneratorLib/Domain/Information/StructureInformation.h
index 5761e3d2..9ede86df 100644
--- a/src/ZoneCodeGeneratorLib/Domain/Information/StructureInformation.h
+++ b/src/ZoneCodeGeneratorLib/Domain/Information/StructureInformation.h
@@ -35,5 +35,4 @@ public:
 
     std::unique_ptr<CustomAction> m_post_load_action;
     const FastFileBlock* m_block;
-    std::vector<MemberInformation*> m_name_chain;
 };
diff --git a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp
index 90d48527..8d3a4fb8 100644
--- a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp
+++ b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp
@@ -105,7 +105,6 @@ namespace
             m_intendation++;
             PrintHeaderConstructor();
             PrintHeaderMainLoadMethodDeclaration(m_env.m_asset);
-            PrintHeaderGetNameMethodDeclaration(m_env.m_asset);
 
             m_intendation--;
             LINE("};")
@@ -172,8 +171,6 @@ namespace
             PrintLoadAssetMethod(m_env.m_asset);
             LINE("")
             PrintMainLoadMethod();
-            LINE("")
-            PrintGetNameMethod();
         }
 
     private:
@@ -232,11 +229,6 @@ namespace
             LINEF("void LoadAsset_{0}({1}** pAsset);", MakeSafeTypeName(info->m_definition), info->m_definition->GetFullName())
         }
 
-        void PrintHeaderGetNameMethodDeclaration(const StructureInformation* info) const
-        {
-            LINEF("static std::string GetAssetName({0}* pAsset);", info->m_definition->GetFullName())
-        }
-
         void PrintHeaderMainLoadMethodDeclaration(const StructureInformation* info) const
         {
             LINEF("XAssetInfo<{0}>* Load({0}** pAsset);", info->m_definition->GetFullName())
@@ -1276,9 +1268,10 @@ namespace
             LINEF("auto* reallocatedAsset = m_zone->GetMemory()->Alloc<{0}>();", info->m_definition->GetFullName())
             LINEF("std::memcpy(reallocatedAsset, *pAsset, sizeof({0}));", info->m_definition->GetFullName())
             LINE("")
-            LINEF("m_asset_info = reinterpret_cast<XAssetInfo<{0}>*>(LinkAsset(GetAssetName(*pAsset), reallocatedAsset, marker.GetDependencies(), "
+            LINEF("m_asset_info = reinterpret_cast<XAssetInfo<{0}>*>(LinkAsset(AssetNameAccessor<{1}>()(**pAsset), reallocatedAsset, marker.GetDependencies(), "
                   "marker.GetUsedScriptStrings(), marker.GetIndirectAssetReferences()));",
-                  info->m_definition->GetFullName())
+                  info->m_definition->GetFullName(),
+                  info->m_asset_name)
             LINE("*pAsset = m_asset_info->Asset();")
 
             m_intendation--;
@@ -1300,7 +1293,9 @@ namespace
             LINE("")
             LINE("if (m_asset_info == nullptr && *pAsset != nullptr)")
             m_intendation++;
-            LINEF("m_asset_info = reinterpret_cast<XAssetInfo<{0}>*>(GetAssetInfo(GetAssetName(*pAsset)));", m_env.m_asset->m_definition->GetFullName())
+            LINEF("m_asset_info = reinterpret_cast<XAssetInfo<{0}>*>(GetAssetInfo(AssetNameAccessor<{1}>()(**pAsset)));",
+                  m_env.m_asset->m_definition->GetFullName(),
+                  m_env.m_asset->m_asset_name)
             m_intendation--;
             LINE("")
             LINE("return m_asset_info;")
@@ -1308,40 +1303,6 @@ namespace
             m_intendation--;
             LINE("}")
         }
-
-        void PrintGetNameMethod()
-        {
-            LINEF("std::string {0}::GetAssetName({1}* pAsset)", LoaderClassName(m_env.m_asset), m_env.m_asset->m_definition->GetFullName())
-            LINE("{")
-            m_intendation++;
-
-            if (!m_env.m_asset->m_name_chain.empty())
-            {
-                LINE_START("return pAsset")
-
-                auto first = true;
-                for (const auto* member : m_env.m_asset->m_name_chain)
-                {
-                    if (first)
-                    {
-                        first = false;
-                        LINE_MIDDLEF("->{0}", member->m_member->m_name)
-                    }
-                    else
-                    {
-                        LINE_MIDDLEF(".{0}", member->m_member->m_name)
-                    }
-                }
-                LINE_END(";")
-            }
-            else
-            {
-                LINEF("return \"{0}\";", m_env.m_asset->m_definition->m_name)
-            }
-
-            m_intendation--;
-            LINE("}")
-        }
     };
 } // namespace
 
diff --git a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp
index 28d4d21d..2dda0606 100644
--- a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp
+++ b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp
@@ -96,7 +96,6 @@ namespace
             }
             PrintHeaderMarkMethodDeclaration(m_env.m_asset);
             LINE("")
-            PrintHeaderGetNameMethodDeclaration(m_env.m_asset);
             PrintHeaderGetAssetInfoMethodDeclaration(m_env.m_asset);
             LINE("")
             PrintHeaderConstructor();
@@ -165,7 +164,6 @@ namespace
             LINE("")
             PrintMainMarkMethod();
             LINE("")
-            PrintGetNameMethod();
             PrintGetAssetInfoMethod();
         }
 
@@ -215,11 +213,6 @@ namespace
             LINEF("XAssetInfo<{0}>* GetAssetInfo({0}* pAsset) const;", info->m_definition->GetFullName())
         }
 
-        void PrintHeaderGetNameMethodDeclaration(const StructureInformation* info) const
-        {
-            LINEF("static std::string GetAssetName({0}* pAsset);", info->m_definition->GetFullName())
-        }
-
         void PrintHeaderConstructor() const
         {
             LINEF("{0}(Zone* zone);", MarkerClassName(m_env.m_asset))
@@ -756,47 +749,15 @@ namespace
             LINE("}")
         }
 
-        void PrintGetNameMethod()
-        {
-            LINEF("std::string {0}::GetAssetName({1}* pAsset)", MarkerClassName(m_env.m_asset), m_env.m_asset->m_definition->GetFullName())
-            LINE("{")
-            m_intendation++;
-
-            if (!m_env.m_asset->m_name_chain.empty())
-            {
-                LINE_START("return pAsset")
-
-                auto first = true;
-                for (auto* member : m_env.m_asset->m_name_chain)
-                {
-                    if (first)
-                    {
-                        first = false;
-                        LINE_MIDDLEF("->{0}", member->m_member->m_name)
-                    }
-                    else
-                    {
-                        LINE_MIDDLEF(".{0}", member->m_member->m_name)
-                    }
-                }
-                LINE_END(";")
-            }
-            else
-            {
-                LINEF("return \"{0}\";", m_env.m_asset->m_definition->m_name)
-            }
-
-            m_intendation--;
-            LINE("}")
-        }
-
         void PrintGetAssetInfoMethod()
         {
             LINEF("XAssetInfo<{0}>* {1}::GetAssetInfo({0}* pAsset) const", m_env.m_asset->m_definition->GetFullName(), MarkerClassName(m_env.m_asset))
             LINE("{")
             m_intendation++;
 
-            LINEF("return reinterpret_cast<XAssetInfo<{0}>*>(GetAssetInfoByName(GetAssetName(pAsset)));", m_env.m_asset->m_definition->GetFullName())
+            LINEF("return reinterpret_cast<XAssetInfo<{0}>*>(GetAssetInfoByName(AssetNameAccessor<{1}>()(*pAsset)));",
+                  m_env.m_asset->m_definition->GetFullName(),
+                  m_env.m_asset->m_asset_name)
 
             m_intendation--;
             LINE("}")
diff --git a/src/ZoneCodeGeneratorLib/Parsing/Commands/Impl/CommandsParser.cpp b/src/ZoneCodeGeneratorLib/Parsing/Commands/Impl/CommandsParser.cpp
index 617d2ca6..303e1d9e 100644
--- a/src/ZoneCodeGeneratorLib/Parsing/Commands/Impl/CommandsParser.cpp
+++ b/src/ZoneCodeGeneratorLib/Parsing/Commands/Impl/CommandsParser.cpp
@@ -11,7 +11,6 @@
 #include "Parsing/Commands/Sequence/SequenceCondition.h"
 #include "Parsing/Commands/Sequence/SequenceCount.h"
 #include "Parsing/Commands/Sequence/SequenceGame.h"
-#include "Parsing/Commands/Sequence/SequenceName.h"
 #include "Parsing/Commands/Sequence/SequenceReorder.h"
 #include "Parsing/Commands/Sequence/SequenceReusable.h"
 #include "Parsing/Commands/Sequence/SequenceScriptString.h"
@@ -39,7 +38,6 @@ const std::vector<CommandsParser::sequence_t*>& CommandsParser::GetTestsForState
         new SequenceCondition(),
         new SequenceCount(),
         new SequenceGame(),
-        new SequenceName(),
         new SequenceReorder(),
         new SequenceReusable(),
         new SequenceScriptString(),
diff --git a/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceName.cpp b/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceName.cpp
deleted file mode 100644
index f364cd57..00000000
--- a/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceName.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "SequenceName.h"
-
-#include "Parsing/Commands/Matcher/CommandsCommonMatchers.h"
-#include "Parsing/Commands/Matcher/CommandsMatcherFactory.h"
-
-namespace
-{
-    static constexpr auto CAPTURE_TYPE = 1;
-}
-
-SequenceName::SequenceName()
-{
-    const CommandsMatcherFactory create(this);
-
-    AddLabeledMatchers(CommandsCommonMatchers::Typename(this), CommandsCommonMatchers::LABEL_TYPENAME);
-    AddMatchers({
-        create.Keyword("set"),
-        create.Keyword("name"),
-        create.Label(CommandsCommonMatchers::LABEL_TYPENAME).Capture(CAPTURE_TYPE),
-        create.Char(';'),
-    });
-}
-
-void SequenceName::ProcessMatch(CommandsParserState* state, SequenceResult<CommandsParserValue>& result) const
-{
-    const auto& typeNameToken = result.NextCapture(CAPTURE_TYPE);
-
-    StructureInformation* type;
-    std::vector<MemberInformation*> members;
-    if (!state->GetTypenameAndMembersFromTypename(typeNameToken.TypeNameValue(), type, members))
-        throw ParsingException(typeNameToken.GetPos(), "Unknown type");
-
-    if (members.empty())
-        throw ParsingException(typeNameToken.GetPos(), "Need to specify a member when trying to set to a structure name.");
-
-    type->m_name_chain = std::move(members);
-}
diff --git a/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceName.h b/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceName.h
deleted file mode 100644
index d9b86d53..00000000
--- a/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceName.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include "Parsing/Commands/Impl/CommandsParser.h"
-
-class SequenceName final : public CommandsParser::sequence_t
-{
-public:
-    SequenceName();
-
-protected:
-    void ProcessMatch(CommandsParserState* state, SequenceResult<CommandsParserValue>& result) const override;
-};