diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp
index 34f8406a9..5d277785f 100644
--- a/source/sw/src/game.cpp
+++ b/source/sw/src/game.cpp
@@ -44,6 +44,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "pal.h"
 #include "automap.h"
 #include "statusbar.h"
+#include "texturemanager.h"
 
 
 #include "mytypes.h"
@@ -157,6 +158,17 @@ int ThemeTrack[6];
 void SybexScreen(void);
 /////////////////////////////////////////////////////////////////////////////////////////////
 
+#define x(a, b) registerName(#a, b);
+static void SetTileNames()
+{
+    auto registerName = [](const char* name, int index)
+    {
+        TexMan.AddAlias(name, tileGetTexture(index));
+    };
+#include "namelist.h"
+}
+#undef x
+
 //---------------------------------------------------------------------------
 //
 //
diff --git a/source/sw/src/jsector.cpp b/source/sw/src/jsector.cpp
index 5d123b4d6..a9384c6ed 100644
--- a/source/sw/src/jsector.cpp
+++ b/source/sw/src/jsector.cpp
@@ -30,6 +30,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 #include "build.h"
 
+#include "names.h"
 #include "names2.h"
 #include "panel.h"
 #include "game.h"
diff --git a/source/sw/src/namelist.h b/source/sw/src/namelist.h
new file mode 100644
index 000000000..84833a60f
--- /dev/null
+++ b/source/sw/src/namelist.h
@@ -0,0 +1,157 @@
+x(ALPHABET, 85)
+x(MENU_MAIN, 295)
+x(MENU_OPTION, 296)
+x(MENU_WHICH, 297)
+x(MENU_CURSOR, 298)
+x(DART1, 2000)
+x(DART2, 2001)
+x(DART3, 2002)
+x(DART4, 2003)
+x(DART, 2004)
+x(FIRE1, 2005)
+x(FIRE2, 2006)
+x(FIRE3, 2007)
+x(FIRE4, 2008)
+x(FIRE5, 2009)
+x(FIREBALL1, 2010)
+x(FIREBALL2, 2011)
+x(FIREBALL3, 2012)
+x(FIREBALL4, 2013)
+x(FLAMES1, 2014)
+x(FLAMES2, 2015)
+x(FLAMES3, 2016)
+x(FLAMES4, 2017)
+x(FLAMES5, 2018)
+x(GAS1, 2019)
+x(GAS2, 2020)
+x(GAS3, 2021)
+x(GAS4, 2022)
+x(GAS5, 2023)
+x(GAS6, 2024)
+x(GAS7, 2025)
+x(GASCLOUD1, 2026)
+x(GASCLOUD2, 2027)
+x(GASCLOUD3, 2028)
+x(GASCLOUD4, 2029)
+x(GASCLOUD5, 2030)
+x(GASCLOUD6, 2031)
+x(GASCLOUD7, 2032)
+x(GASCLOUD8, 2033)
+x(GASCLOUD9, 2034)
+x(LIGHT1, 2035)
+x(LIGHT2, 2036)
+x(LIGHT3, 2037)
+x(LIGHT4, 2038)
+x(LIGHT5, 2039)
+x(LIGHT6, 2040)
+x(ELECTRO1, 2041)
+x(ELECTRO2, 2042)
+x(ELECTRO3, 2043)
+x(RIFLE1, 2044)
+x(RIFLE2, 2045)
+x(RIFLE3, 2046)
+x(DONTUSE_EXTRA, 2047)
+x(RIFLE4, 2048)
+x(CARTRIGE3, 2053)
+x(STATUE1, 2054)
+x(STATUE2, 2055)
+x(STATUE3, 2056)
+x(STATUE4, 2057)
+x(SWORD3, 2065)
+x(SWORD4, 2066)
+x(SWORD1, 2067)
+x(SWORD2, 2068)
+x(SWORD5, 2069)
+x(BLACK___, 2306)
+x(FragBarErase, 2375)
+x(FragBarErase2, 2376)
+x(MENUBAR, 2427)
+
+x(MIRROR, 340)
+x(FLOORMIRROR, 341)
+x(CAMSPRITE, 3830)
+
+
+x(ICON_STAR, 1793)
+
+x(ICON_UZI, 1797)
+x(ICON_UZIFLOOR, 1807)
+x(ICON_LG_UZI_AMMO, 1799)
+
+x(ICON_HEART, 1824)
+x(ICON_HEART_LG_AMMO, 1820)
+
+x(ICON_GUARD_HEAD, 1814)
+x(ICON_FIREBALL_LG_AMMO, 3035)
+
+x(NAPALM_MIN_AMMO, 10)
+x(RING_MIN_AMMO, 30)
+
+x(ICON_ROCKET, 1843)
+x(ICON_SHOTGUN, 1794)
+x(ICON_LG_ROCKET, 1796)
+x(ICON_LG_SHOTSHELL, 1823)
+x(ICON_AUTORIOT, 1822)
+
+x(ICON_MICRO_GUN, 1818)
+x(ICON_MICRO_BATTERY, 1800)
+
+x(ICON_GRENADE_LAUNCHER, 1817)
+x(ICON_LG_GRENADE, 1831)
+
+x(ICON_LG_MINE, 1842)
+
+x(ICON_RAIL_GUN, 1811)
+x(ICON_RAIL_AMMO, 1812)
+
+//, not, used, now)
+x(ICON_SPELL, 1880)
+x(ICON_ELECTRO, 1822)
+
+x(ICON_EXPLOSIVE_BOX, 1801)
+x(ICON_ENVIRON_SUIT, 1837)
+x(ICON_FLY, 1782)
+x(ICON_CLOAK, 1804)
+x(ICON_NIGHT_VISION, 3031)
+x(ICON_NAPALM, 3046)
+x(ICON_RING, 3050)
+x(ICON_GOROAMMO, 3035)
+x(ICON_HEARTAMMO, 1820)
+x(ICON_RINGAMMO, 3054)
+x(ICON_NAPALMAMMO, 3058)
+x(ICON_GRENADE, 3059)
+x(ICON_OXYGEN, 1800)
+x(ICON_ARMOR, 3030)
+x(ICON_SM_MEDKIT, 1802)
+x(ICON_BOOSTER, 1810)
+x(ICON_HEAT_CARD, 1819)
+x(ICON_REPAIR_KIT, 1813)
+x(ICON_MEDKIT, 1803)
+x(ICON_CHEMBOMB, 1808)
+x(ICON_FLASHBOMB, 1805)
+x(ICON_NUKE, 1809)
+x(ICON_CALTROPS, 1829)
+x(ICON_FLAG, 2520)
+
+x(COINCURSOR, 2440)
+x(STARTALPHANUM, 4608)
+x(ENDALPHANUM, 4701)
+
+x(STATUS_BAR, 2434)
+x(STATUS_KEYS, 2881)
+x(STATUS_NUMBERS, 2887)
+x(BORDER_TILE, 2604)
+
+
+x(BLUE_KEY, 1766)
+x(RED_KEY, 1770)
+x(GREEN_KEY, 1774)
+x(YELLOW_KEY, 1778)
+x(GOLD_SKELKEY, 1765)
+x(SILVER_SKELKEY, 1769)
+x(BRONZE_SKELKEY, 1773)
+x(RED_SKELKEY, 1777)
+x(BLUE_CARD, 1767)
+x(RED_CARD, 1771)
+x(GREEN_CARD, 1775)
+x(YELLOW_CARD, 1779)
diff --git a/source/sw/src/names.h b/source/sw/src/names.h
index f638318ce..05421a3e3 100644
--- a/source/sw/src/names.h
+++ b/source/sw/src/names.h
@@ -25,74 +25,16 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 //-------------------------------------------------------------------------
 
 //Be careful when changing this file - it is parsed by Editart and Build.
-#define ALPHABET 85
-#define MENU_MAIN 295
-#define MENU_OPTION 296
-#define MENU_WHICH 297
-#define MENU_CURSOR 298
-#define DART1 2000
-#define DART2 2001
-#define DART3 2002
-#define DART4 2003
-#define DART 2004
-#define FIRE1 2005
-#define FIRE2 2006
-#define FIRE3 2007
-#define FIRE4 2008
-#define FIRE5 2009
-#define FIREBALL1 2010
-#define FIREBALL2 2011
-#define FIREBALL3 2012
-#define FIREBALL4 2013
-#define FLAMES1 2014
-#define FLAMES2 2015
-#define FLAMES3 2016
-#define FLAMES4 2017
-#define FLAMES5 2018
-#define GAS1 2019
-#define GAS2 2020
-#define GAS3 2021
-#define GAS4 2022
-#define GAS5 2023
-#define GAS6 2024
-#define GAS7 2025
-#define GASCLOUD1 2026
-#define GASCLOUD2 2027
-#define GASCLOUD3 2028
-#define GASCLOUD4 2029
-#define GASCLOUD5 2030
-#define GASCLOUD6 2031
-#define GASCLOUD7 2032
-#define GASCLOUD8 2033
-#define GASCLOUD9 2034
-#define LIGHT1 2035
-#define LIGHT2 2036
-#define LIGHT3 2037
-#define LIGHT4 2038
-#define LIGHT5 2039
-#define LIGHT6 2040
-#define ELECTRO1 2041
-#define ELECTRO2 2042
-#define ELECTRO3 2043
-#define RIFLE1 2044
-#define RIFLE2 2045
-#define RIFLE3 2046
-#define DONTUSE_EXTRA 2047
-#define RIFLE4 2048
-#define CARTRIGE3 2053
-#define STATUE1 2054
-#define STATUE2 2055
-#define STATUE3 2056
-#define STATUE4 2057
-#define SWORD3 2065
-#define SWORD4 2066
-#define SWORD1 2067
-#define SWORD2 2068
-#define SWORD5 2069
-#define BLACK___ 2306
-#define FragBarErase 2375
-#define FragBarErase2 2376
 
-#define MIRROR          340
-#define FLOORMIRROR     341
-#define CAMSPRITE       3830
+#pragma once
+
+BEGIN_SW_NS
+
+#define x(a, b) a = b,
+enum
+{
+#include "namelist.h"
+};
+#undef x
+
+END_SW_NS
diff --git a/source/sw/src/names2.h b/source/sw/src/names2.h
index bb53340d8..0e6485150 100644
--- a/source/sw/src/names2.h
+++ b/source/sw/src/names2.h
@@ -232,69 +232,6 @@ enum STAT_ENUMS
 //
 //////////////////////
 
-#define ICON_STAR  1793
-
-#define ICON_UZI   1797
-#define ICON_UZIFLOOR 1807
-#define ICON_LG_UZI_AMMO  1799
-
-#define ICON_HEART      1824
-#define ICON_HEART_LG_AMMO 1820
-
-#define ICON_GUARD_HEAD 1814
-#define ICON_FIREBALL_LG_AMMO 3035
-
-#define NAPALM_MIN_AMMO 10
-#define RING_MIN_AMMO 30
-
-#define ICON_ROCKET      1843
-#define ICON_SHOTGUN     1794
-#define ICON_LG_ROCKET 1796
-#define ICON_LG_SHOTSHELL 1823
-#define ICON_AUTORIOT 1822
-
-#define ICON_MICRO_GUN 1818
-#define ICON_MICRO_BATTERY 1800
-
-#define ICON_GRENADE_LAUNCHER 1817
-#define ICON_LG_GRENADE 1831
-
-#define ICON_LG_MINE 1842
-
-#define ICON_RAIL_GUN 1811
-#define ICON_RAIL_AMMO 1812
-
-// not used now
-#define ICON_SPELL     1880
-#define ICON_ELECTRO   1822
-
-#define ICON_EXPLOSIVE_BOX 1801
-#define ICON_ENVIRON_SUIT   1837
-#define ICON_FLY      1782
-#define ICON_CLOAK    1804
-#define ICON_NIGHT_VISION 3031
-#define ICON_NAPALM      3046
-#define ICON_RING        3050
-#define ICON_GOROAMMO    3035
-#define ICON_HEARTAMMO   1820
-#define ICON_RINGAMMO    3054
-#define ICON_NAPALMAMMO  3058
-#define ICON_GRENADE     3059
-#define ICON_OXYGEN      1800
-#define ICON_ARMOR       3030
-#define ICON_SM_MEDKIT   1802
-#define ICON_BOOSTER     1810
-#define ICON_HEAT_CARD   1819
-#define ICON_REPAIR_KIT  1813
-#define ICON_MEDKIT      1803
-#define ICON_CHEMBOMB    1808
-#define ICON_FLASHBOMB   1805
-#define ICON_NUKE        1809
-#define ICON_CALTROPS    1829
-#define ICON_FLAG        2520
-
-
-
 #define STAR 2039
 #define ELECTRO 2025
 
@@ -345,29 +282,6 @@ enum STAT_ENUMS
 //
 //////////////////////
 
-#define COINCURSOR    2440  // Jim uses this for a text input cursor
-#define STARTALPHANUM 4608  // New SW font for typing in stuff, It's in ASCII order.
-#define ENDALPHANUM   4701
-
-#define STATUS_BAR 2434
-#define STATUS_KEYS 2881
-#define STATUS_NUMBERS 2887
-#define BORDER_TILE 2604
-
-
-#define BLUE_KEY 1766
-#define RED_KEY 1770
-#define GREEN_KEY 1774
-#define YELLOW_KEY 1778
-#define GOLD_SKELKEY 1765
-#define SILVER_SKELKEY 1769
-#define BRONZE_SKELKEY 1773
-#define RED_SKELKEY 1777
-#define BLUE_CARD 1767
-#define RED_CARD 1771
-#define GREEN_CARD 1775
-#define YELLOW_CARD 1779
-
 #define BLUE_KEY_STATUE BLUE_KEY+2
 #define RED_KEY_STATUE RED_KEY+2
 #define GREEN_KEY_STATUE GREEN_KEY+2
diff --git a/source/sw/src/sbar.cpp b/source/sw/src/sbar.cpp
index e14ffba33..c2877db16 100644
--- a/source/sw/src/sbar.cpp
+++ b/source/sw/src/sbar.cpp
@@ -30,6 +30,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "build.h"
 
 #include "game.h"
+#include "names.h"
 #include "names2.h"
 #include "panel.h"
 #include "pal.h"