diff --git a/res/ACTION.DHGR.UNCOMPRESSED/LAST.NINJA b/res/ACTION.DHGR.UNCOMPRESSED/THE.LAST.NINJA
similarity index 100%
rename from res/ACTION.DHGR.UNCOMPRESSED/LAST.NINJA
rename to res/ACTION.DHGR.UNCOMPRESSED/THE.LAST.NINJA
diff --git a/res/ACTION.DHGR.UNCOMPRESSED/LAST.NINJA2 b/res/ACTION.DHGR.UNCOMPRESSED/THE.LAST.NINJA2
similarity index 100%
rename from res/ACTION.DHGR.UNCOMPRESSED/LAST.NINJA2
rename to res/ACTION.DHGR.UNCOMPRESSED/THE.LAST.NINJA2
diff --git a/res/ACTION.DHGR.UNCOMPRESSED/LAST.NINJA3 b/res/ACTION.DHGR.UNCOMPRESSED/THE.LAST.NINJA3
similarity index 100%
rename from res/ACTION.DHGR.UNCOMPRESSED/LAST.NINJA3
rename to res/ACTION.DHGR.UNCOMPRESSED/THE.LAST.NINJA3
diff --git a/res/ACTION.DHGR.UNCOMPRESSED/LAST.NINJA4 b/res/ACTION.DHGR.UNCOMPRESSED/THE.LAST.NINJA4
similarity index 100%
rename from res/ACTION.DHGR.UNCOMPRESSED/LAST.NINJA4
rename to res/ACTION.DHGR.UNCOMPRESSED/THE.LAST.NINJA4
diff --git a/res/ACTION.DHGR/LAST.NINJA b/res/ACTION.DHGR/THE.LAST.NINJA
similarity index 100%
rename from res/ACTION.DHGR/LAST.NINJA
rename to res/ACTION.DHGR/THE.LAST.NINJA
diff --git a/res/ACTION.DHGR/LAST.NINJA2 b/res/ACTION.DHGR/THE.LAST.NINJA2
similarity index 100%
rename from res/ACTION.DHGR/LAST.NINJA2
rename to res/ACTION.DHGR/THE.LAST.NINJA2
diff --git a/res/ACTION.DHGR/LAST.NINJA3 b/res/ACTION.DHGR/THE.LAST.NINJA3
similarity index 100%
rename from res/ACTION.DHGR/LAST.NINJA3
rename to res/ACTION.DHGR/THE.LAST.NINJA3
diff --git a/res/ACTION.DHGR/LAST.NINJA4 b/res/ACTION.DHGR/THE.LAST.NINJA4
similarity index 100%
rename from res/ACTION.DHGR/LAST.NINJA4
rename to res/ACTION.DHGR/THE.LAST.NINJA4
diff --git a/res/ACTION.DHGR/_FileInformation.txt b/res/ACTION.DHGR/_FileInformation.txt
index 3471bb086..9ad6e1958 100644
--- a/res/ACTION.DHGR/_FileInformation.txt
+++ b/res/ACTION.DHGR/_FileInformation.txt
@@ -27,10 +27,6 @@ HEAVY3=Type(06),AuxType(3FF8),Access(C3)
 INDIANA.JONES=Type(06),AuxType(3FF8),Access(C3)
 INDIANA.JONES2=Type(06),AuxType(3FF8),Access(C3)
 INDIANA.JONES3=Type(06),AuxType(3FF8),Access(C3)
-LAST.NINJA=Type(06),AuxType(3FF8),Access(C3)
-LAST.NINJA2=Type(06),AuxType(3FF8),Access(C3)
-LAST.NINJA3=Type(06),AuxType(3FF8),Access(C3)
-LAST.NINJA4=Type(06),AuxType(3FF8),Access(C3)
 PIPEDREAM=Type(06),AuxType(3FF8),Access(C3)
 PIPEDREAM2=Type(06),AuxType(3FF8),Access(C3)
 PIPEDREAM3=Type(06),AuxType(3FF8),Access(C3)
@@ -85,6 +81,10 @@ TETRIS=Type(06),AuxType(3FF8),Access(C3)
 TETRIS2=Type(06),AuxType(3FF8),Access(C3)
 TETRIS3=Type(06),AuxType(3FF8),Access(C3)
 TETRIS4=Type(06),AuxType(3FF8),Access(C3)
+THE.LAST.NINJA=Type(06),AuxType(3FF8),Access(C3)
+THE.LAST.NINJA2=Type(06),AuxType(3FF8),Access(C3)
+THE.LAST.NINJA3=Type(06),AuxType(3FF8),Access(C3)
+THE.LAST.NINJA4=Type(06),AuxType(3FF8),Access(C3)
 THEXDER=Type(06),AuxType(3FF8),Access(C3)
 THEXDER2=Type(06),AuxType(3FF8),Access(C3)
 THEXDER3=Type(06),AuxType(3FF8),Access(C3)
diff --git a/res/ACTION.HGR.UNCOMPRESSED/AGENT.USA b/res/ACTION.HGR.UNCOMPRESSED/AGENT.U.S.A
similarity index 100%
rename from res/ACTION.HGR.UNCOMPRESSED/AGENT.USA
rename to res/ACTION.HGR.UNCOMPRESSED/AGENT.U.S.A
diff --git a/res/ACTION.HGR.UNCOMPRESSED/FORMULA.1 b/res/ACTION.HGR.UNCOMPRESSED/FORMULA.1.RACER
similarity index 100%
rename from res/ACTION.HGR.UNCOMPRESSED/FORMULA.1
rename to res/ACTION.HGR.UNCOMPRESSED/FORMULA.1.RACER
diff --git a/res/ACTION.HGR.UNCOMPRESSED/HERO b/res/ACTION.HGR.UNCOMPRESSED/H.E.R.O
similarity index 100%
rename from res/ACTION.HGR.UNCOMPRESSED/HERO
rename to res/ACTION.HGR.UNCOMPRESSED/H.E.R.O
diff --git a/res/ACTION.HGR.UNCOMPRESSED/NORAD b/res/ACTION.HGR.UNCOMPRESSED/N.O.R.A.D
old mode 100755
new mode 100644
similarity index 100%
rename from res/ACTION.HGR.UNCOMPRESSED/NORAD
rename to res/ACTION.HGR.UNCOMPRESSED/N.O.R.A.D
diff --git a/res/ACTION.HGR.UNCOMPRESSED/NORAD2 b/res/ACTION.HGR.UNCOMPRESSED/N.O.R.A.D2
old mode 100755
new mode 100644
similarity index 100%
rename from res/ACTION.HGR.UNCOMPRESSED/NORAD2
rename to res/ACTION.HGR.UNCOMPRESSED/N.O.R.A.D2
diff --git a/res/ACTION.HGR.UNCOMPRESSED/ROBOTRON b/res/ACTION.HGR.UNCOMPRESSED/ROBOTRON.2084
similarity index 100%
rename from res/ACTION.HGR.UNCOMPRESSED/ROBOTRON
rename to res/ACTION.HGR.UNCOMPRESSED/ROBOTRON.2084
diff --git a/res/ACTION.HGR.UNCOMPRESSED/GOONIES b/res/ACTION.HGR.UNCOMPRESSED/THE.GOONIES
similarity index 100%
rename from res/ACTION.HGR.UNCOMPRESSED/GOONIES
rename to res/ACTION.HGR.UNCOMPRESSED/THE.GOONIES
diff --git a/res/ACTION.HGR.UNCOMPRESSED/GOONIES2 b/res/ACTION.HGR.UNCOMPRESSED/THE.GOONIES2
similarity index 100%
rename from res/ACTION.HGR.UNCOMPRESSED/GOONIES2
rename to res/ACTION.HGR.UNCOMPRESSED/THE.GOONIES2
diff --git a/res/ACTION.HGR.UNCOMPRESSED/GOONIES3 b/res/ACTION.HGR.UNCOMPRESSED/THE.GOONIES3
similarity index 100%
rename from res/ACTION.HGR.UNCOMPRESSED/GOONIES3
rename to res/ACTION.HGR.UNCOMPRESSED/THE.GOONIES3
diff --git a/res/ACTION.HGR.UNCOMPRESSED/GOONIES4 b/res/ACTION.HGR.UNCOMPRESSED/THE.GOONIES4
similarity index 100%
rename from res/ACTION.HGR.UNCOMPRESSED/GOONIES4
rename to res/ACTION.HGR.UNCOMPRESSED/THE.GOONIES4
diff --git a/res/ACTION.HGR.UNCOMPRESSED/GOONIES5 b/res/ACTION.HGR.UNCOMPRESSED/THE.GOONIES5
similarity index 100%
rename from res/ACTION.HGR.UNCOMPRESSED/GOONIES5
rename to res/ACTION.HGR.UNCOMPRESSED/THE.GOONIES5
diff --git a/res/ACTION.HGR.UNCOMPRESSED/GOONIES6 b/res/ACTION.HGR.UNCOMPRESSED/THE.GOONIES6
similarity index 100%
rename from res/ACTION.HGR.UNCOMPRESSED/GOONIES6
rename to res/ACTION.HGR.UNCOMPRESSED/THE.GOONIES6
diff --git a/res/ACTION.HGR/AGENT.USA b/res/ACTION.HGR/AGENT.U.S.A
similarity index 100%
rename from res/ACTION.HGR/AGENT.USA
rename to res/ACTION.HGR/AGENT.U.S.A
diff --git a/res/ACTION.HGR/FORMULA.1 b/res/ACTION.HGR/FORMULA.1.RACER
similarity index 100%
rename from res/ACTION.HGR/FORMULA.1
rename to res/ACTION.HGR/FORMULA.1.RACER
diff --git a/res/ACTION.HGR/HERO b/res/ACTION.HGR/H.E.R.O
similarity index 100%
rename from res/ACTION.HGR/HERO
rename to res/ACTION.HGR/H.E.R.O
diff --git a/res/ACTION.HGR/NORAD b/res/ACTION.HGR/N.O.R.A.D
similarity index 100%
rename from res/ACTION.HGR/NORAD
rename to res/ACTION.HGR/N.O.R.A.D
diff --git a/res/ACTION.HGR/NORAD2 b/res/ACTION.HGR/N.O.R.A.D2
similarity index 100%
rename from res/ACTION.HGR/NORAD2
rename to res/ACTION.HGR/N.O.R.A.D2
diff --git a/res/ACTION.HGR/ROBOTRON b/res/ACTION.HGR/ROBOTRON.2084
similarity index 100%
rename from res/ACTION.HGR/ROBOTRON
rename to res/ACTION.HGR/ROBOTRON.2084
diff --git a/res/ACTION.HGR/GOONIES b/res/ACTION.HGR/THE.GOONIES
similarity index 100%
rename from res/ACTION.HGR/GOONIES
rename to res/ACTION.HGR/THE.GOONIES
diff --git a/res/ACTION.HGR/GOONIES2 b/res/ACTION.HGR/THE.GOONIES2
similarity index 100%
rename from res/ACTION.HGR/GOONIES2
rename to res/ACTION.HGR/THE.GOONIES2
diff --git a/res/ACTION.HGR/GOONIES3 b/res/ACTION.HGR/THE.GOONIES3
similarity index 100%
rename from res/ACTION.HGR/GOONIES3
rename to res/ACTION.HGR/THE.GOONIES3
diff --git a/res/ACTION.HGR/GOONIES4 b/res/ACTION.HGR/THE.GOONIES4
similarity index 100%
rename from res/ACTION.HGR/GOONIES4
rename to res/ACTION.HGR/THE.GOONIES4
diff --git a/res/ACTION.HGR/GOONIES5 b/res/ACTION.HGR/THE.GOONIES5
similarity index 100%
rename from res/ACTION.HGR/GOONIES5
rename to res/ACTION.HGR/THE.GOONIES5
diff --git a/res/ACTION.HGR/GOONIES6 b/res/ACTION.HGR/THE.GOONIES6
similarity index 100%
rename from res/ACTION.HGR/GOONIES6
rename to res/ACTION.HGR/THE.GOONIES6
diff --git a/res/ACTION.HGR/_FileInformation.txt b/res/ACTION.HGR/_FileInformation.txt
index aa24b016d..da4368c24 100644
--- a/res/ACTION.HGR/_FileInformation.txt
+++ b/res/ACTION.HGR/_FileInformation.txt
@@ -1,4 +1,4 @@
-AGENT.USA=Type(06),AuxType(3FF8),Access(C3)
+AGENT.U.S.A=Type(06),AuxType(3FF8),Access(C3)
 ALCAZAR=Type(06),AuxType(3FF8),Access(C3)
 ALIEN.AMBUSH=Type(06),AuxType(3FF8),Access(C3)
 ALIEN.DOWNPOUR=Type(06),AuxType(3FF8),Access(C3)
@@ -162,7 +162,7 @@ FORCE.7=Type(06),AuxType(3FF8),Access(C3)
 FORCE.72=Type(06),AuxType(3FF8),Access(C3)
 FORCE.73=Type(06),AuxType(3FF8),Access(C3)
 FORCE.74=Type(06),AuxType(3FF8),Access(C3)
-FORMULA.1=Type(06),AuxType(3FF8),Access(C3)
+FORMULA.1.RACER=Type(06),AuxType(3FF8),Access(C3)
 FREE.FALL=Type(06),AuxType(3FF8),Access(C3)
 FREE.FALL2=Type(06),AuxType(3FF8),Access(C3)
 FROGGER=Type(06),AuxType(3FF8),Access(C3)
@@ -187,24 +187,18 @@ GENIUS.2C=Type(06),AuxType(3FF8),Access(C3)
 GENIUSB=Type(06),AuxType(3FF8),Access(C3)
 GENIUSC=Type(06),AuxType(3FF8),Access(C3)
 GOLD.RUSH=Type(06),AuxType(3FF8),Access(C3)
-GOONIES=Type(06),AuxType(3FF8),Access(C3)
-GOONIES2=Type(06),AuxType(3FF8),Access(C3)
-GOONIES3=Type(06),AuxType(3FF8),Access(C3)
-GOONIES4=Type(06),AuxType(3FF8),Access(C3)
-GOONIES5=Type(06),AuxType(3FF8),Access(C3)
-GOONIES6=Type(06),AuxType(3FF8),Access(C3)
 GORGON=Type(06),AuxType(3FF8),Access(C3)
 GREMLINS=Type(06),AuxType(3FF8),Access(C3)
 GUARDIAN=Type(06),AuxType(3FF8),Access(C3)
 GUARDIAN2=Type(06),AuxType(3FF8),Access(C3)
 GUMBALL=Type(06),AuxType(3FF8),Access(C3)
 GUMBALL2=Type(06),AuxType(3FF8),Access(C3)
+H.E.R.O=Type(06),AuxType(3FF8),Access(C3)
 HADRON=Type(06),AuxType(3FF8),Access(C3)
 HARD.HAT.MACK=Type(06),AuxType(3FF8),Access(C3)
 HARD.HAT.MACK2=Type(06),AuxType(3FF8),Access(C3)
 HARD.HAT.MACK3=Type(06),AuxType(3FF8),Access(C3)
 HEAD.ON=Type(06),AuxType(3FF8),Access(C3)
-HERO=Type(06),AuxType(3FF8),Access(C3)
 HIGH.RISE=Type(06),AuxType(3FF8),Access(C3)
 HORIZON.V=Type(06),AuxType(3FF8),Access(C3)
 HORIZON.V2=Type(06),AuxType(3FF8),Access(C3)
@@ -295,11 +289,11 @@ MR.DO.L09=Type(06),AuxType(3FF8),Access(C3)
 MR.DO.L10=Type(06),AuxType(3FF8),Access(C3)
 MR.ROBOT=Type(06),AuxType(3FF8),Access(C3)
 MS.PACMAN=Type(06),AuxType(3FF8),Access(C3)
+N.O.R.A.D=Type(06),AuxType(3FF8),Access(C3)
+N.O.R.A.D2=Type(06),AuxType(3FF8),Access(C3)
 NIBBLER=Type(06),AuxType(3FF8),Access(C3)
 NIGHT.STALKER=Type(06),AuxType(3FF8),Access(C3)
 NIGHTMARE=Type(06),AuxType(3FF8),Access(C3)
-NORAD=Type(06),AuxType(3FF8),Access(C3)
-NORAD2=Type(06),AuxType(3FF8),Access(C3)
 ONE.ON.ONE=Type(06),AuxType(3FF8),Access(C3)
 ONE.ON.ONE2=Type(06),AuxType(3FF8),Access(C3)
 ORBITRON=Type(06),AuxType(3FF8),Access(C3)
@@ -383,7 +377,7 @@ RESCUE.RAIDERS2=Type(06),AuxType(3FF8),Access(C3)
 RESCUE.RAIDERS3=Type(06),AuxType(3FF8),Access(C3)
 RIBBIT=Type(06),AuxType(3FF8),Access(C3)
 ROADBLOCK=Type(06),AuxType(3FF8),Access(C3)
-ROBOTRON=Type(06),AuxType(3FF8),Access(C3)
+ROBOTRON.2084=Type(06),AuxType(3FF8),Access(C3)
 RUSSKI.DUCK=Type(06),AuxType(3FF8),Access(C3)
 SABOTAGE=Type(06),AuxType(3FF8),Access(C3)
 SAMMY.LIGHTFOOT=Type(06),AuxType(3FF8),Access(C3)
@@ -470,6 +464,12 @@ TETRIS5=Type(06),AuxType(3FF8),Access(C3)
 TETRIS6=Type(06),AuxType(3FF8),Access(C3)
 THE.BILESTOAD=Type(06),AuxType(3FF8),Access(C3)
 THE.BILESTOAD2=Type(06),AuxType(3FF8),Access(C3)
+THE.GOONIES=Type(06),AuxType(3FF8),Access(C3)
+THE.GOONIES2=Type(06),AuxType(3FF8),Access(C3)
+THE.GOONIES3=Type(06),AuxType(3FF8),Access(C3)
+THE.GOONIES4=Type(06),AuxType(3FF8),Access(C3)
+THE.GOONIES5=Type(06),AuxType(3FF8),Access(C3)
+THE.GOONIES6=Type(06),AuxType(3FF8),Access(C3)
 THE.HEIST01=Type(06),AuxType(3FF8),Access(C3)
 THE.HEIST02=Type(06),AuxType(3FF8),Access(C3)
 THE.HEIST03=Type(06),AuxType(3FF8),Access(C3)
diff --git a/res/ARTWORK.SHR.UNCOMPRESSED/AGENT.USA b/res/ARTWORK.SHR.UNCOMPRESSED/AGENT.U.S.A
similarity index 100%
rename from res/ARTWORK.SHR.UNCOMPRESSED/AGENT.USA
rename to res/ARTWORK.SHR.UNCOMPRESSED/AGENT.U.S.A
diff --git a/res/ARTWORK.SHR.UNCOMPRESSED/HERO b/res/ARTWORK.SHR.UNCOMPRESSED/H.E.R.O
similarity index 100%
rename from res/ARTWORK.SHR.UNCOMPRESSED/HERO
rename to res/ARTWORK.SHR.UNCOMPRESSED/H.E.R.O
diff --git a/res/ARTWORK.SHR.UNCOMPRESSED/GOONIES b/res/ARTWORK.SHR.UNCOMPRESSED/THE.GOONIES
similarity index 100%
rename from res/ARTWORK.SHR.UNCOMPRESSED/GOONIES
rename to res/ARTWORK.SHR.UNCOMPRESSED/THE.GOONIES
diff --git a/res/ARTWORK.SHR.UNCOMPRESSED/LAST.NINJA b/res/ARTWORK.SHR.UNCOMPRESSED/THE.LAST.NINJA
similarity index 100%
rename from res/ARTWORK.SHR.UNCOMPRESSED/LAST.NINJA
rename to res/ARTWORK.SHR.UNCOMPRESSED/THE.LAST.NINJA
diff --git a/res/ARTWORK.SHR/AGENT.USA b/res/ARTWORK.SHR/AGENT.U.S.A
similarity index 100%
rename from res/ARTWORK.SHR/AGENT.USA
rename to res/ARTWORK.SHR/AGENT.U.S.A
diff --git a/res/ARTWORK.SHR/HERO b/res/ARTWORK.SHR/H.E.R.O
similarity index 100%
rename from res/ARTWORK.SHR/HERO
rename to res/ARTWORK.SHR/H.E.R.O
diff --git a/res/ARTWORK.SHR/GOONIES b/res/ARTWORK.SHR/THE.GOONIES
similarity index 100%
rename from res/ARTWORK.SHR/GOONIES
rename to res/ARTWORK.SHR/THE.GOONIES
diff --git a/res/ARTWORK.SHR/LAST.NINJA b/res/ARTWORK.SHR/THE.LAST.NINJA
similarity index 100%
rename from res/ARTWORK.SHR/LAST.NINJA
rename to res/ARTWORK.SHR/THE.LAST.NINJA
diff --git a/res/ARTWORK.SHR/_FileInformation.txt b/res/ARTWORK.SHR/_FileInformation.txt
index 3686f6ebe..135a27d58 100644
--- a/res/ARTWORK.SHR/_FileInformation.txt
+++ b/res/ARTWORK.SHR/_FileInformation.txt
@@ -1,4 +1,4 @@
-AGENT.USA=Type(06),AuxType(1FF8),Access(C3)
+AGENT.U.S.A=Type(06),AuxType(1FF8),Access(C3)
 ALCAZAR=Type(06),AuxType(1FF8),Access(C3)
 ALIEN.AMBUSH=Type(06),AuxType(1FF8),Access(C3)
 ALIEN.TYPHOON=Type(06),AuxType(1FF8),Access(C3)
@@ -38,12 +38,11 @@ FORCE.7=Type(06),AuxType(1FF8),Access(C3)
 FROGGER.II=Type(06),AuxType(1FF8),Access(C3)
 FS2=Type(06),AuxType(1FF8),Access(C3)
 GAUNTLET=Type(06),AuxType(1FF8),Access(C3)
-GOONIES=Type(06),AuxType(1FF8),Access(C3)
 GORGON=Type(06),AuxType(1FF8),Access(C3)
 GUMBALL=Type(06),AuxType(1FF8),Access(C3)
+H.E.R.O=Type(06),AuxType(1FF8),Access(C3)
 HARD.HAT.MACK=Type(06),AuxType(1FF8),Access(C3)
 HEAVY.BARREL=Type(06),AuxType(1FF8),Access(C3)
-HERO=Type(06),AuxType(1FF8),Access(C3)
 HUNGRY.BOY=Type(06),AuxType(1FF8),Access(C3)
 IKARI.WARRIORS=Type(06),AuxType(1FF8),Access(C3)
 IMPOSSIBLE.MISS=Type(06),AuxType(1FF8),Access(C3)
@@ -53,7 +52,6 @@ KARATEKA=Type(06),AuxType(1FF8),Access(C3)
 KID.NIKI=Type(06),AuxType(1FF8),Access(C3)
 LADY.TUT=Type(06),AuxType(1FF8),Access(C3)
 LANCASTER=Type(06),AuxType(1FF8),Access(C3)
-LAST.NINJA=Type(06),AuxType(1FF8),Access(C3)
 LAZER.SILK=Type(06),AuxType(1FF8),Access(C3)
 LOST.TOMB=Type(06),AuxType(1FF8),Access(C3)
 MARBLE.MADNESS=Type(06),AuxType(1FF8),Access(C3)
@@ -104,7 +102,9 @@ TAG.TEAM=Type(06),AuxType(1FF8),Access(C3)
 TECHNOCOP=Type(06),AuxType(1FF8),Access(C3)
 TEST.DRIVE=Type(06),AuxType(1FF8),Access(C3)
 TETRIS=Type(06),AuxType(1FF8),Access(C3)
+THE.GOONIES=Type(06),AuxType(1FF8),Access(C3)
 THE.HEIST=Type(06),AuxType(1FF8),Access(C3)
+THE.LAST.NINJA=Type(06),AuxType(1FF8),Access(C3)
 THEXDER=Type(06),AuxType(1FF8),Access(C3)
 TOMAHAWK=Type(06),AuxType(1FF8),Access(C3)
 TRIAD=Type(06),AuxType(1FF8),Access(C3)
diff --git a/res/ATTRACT.CONF b/res/ATTRACT.CONF
index 859a8d43e..996244a71 100644
--- a/res/ATTRACT.CONF
+++ b/res/ATTRACT.CONF
@@ -84,7 +84,7 @@ REPTON=0
 DATAMOST.CONF=1
 BOLO=0
 ACTIONCLR4.CONF=2
-AGENT.USA=0
+AGENT.U.S.A=0
 ACTDHGR3.CONF=4
 ACTIONMNO3.CONF=2
 MNO1.CONF=1
@@ -115,7 +115,7 @@ CEILING.ZERO=0
 ACTDHGR5.CONF=4
 ACTIONPQR2.CONF=2
 P2.CONF=1
-ROBOTRON=0
+ROBOTRON.2084=0
 ACTIONPOP5.CONF=2
 SHR9.CONF=5
 
@@ -143,7 +143,7 @@ CHOPLIFTER=0
 ACTDHGR7.CONF=4
 ACTIONEFG1.CONF=2
 HIJKL2.CONF=1
-GOONIES=0
+THE.GOONIES=0
 ACTIONSGII.CONF=2
 SHR11.CONF=5
 
diff --git a/res/ATTRACT/AGENT.U.S.A b/res/ATTRACT/AGENT.U.S.A
new file mode 100644
index 000000000..659752221
--- /dev/null
+++ b/res/ATTRACT/AGENT.U.S.A
@@ -0,0 +1,9 @@
+#
+# Attract mode for Agent U S A
+#
+
+ARTWORK.SHR/AGENT.U.S.A=C
+ACTION.HGR/AGENT.U.S.A=A
+AGENT.U.S.A=0
+
+[eof]
diff --git a/res/ATTRACT/AGENT.USA b/res/ATTRACT/AGENT.USA
deleted file mode 100644
index f4182e3a5..000000000
--- a/res/ATTRACT/AGENT.USA
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Attract mode for Agent U S A
-#
-
-ARTWORK.SHR/AGENT.USA=C
-ACTION.HGR/AGENT.USA=A
-AGENT.USA=0
-
-[eof]
diff --git a/res/ATTRACT/FORMULA.1 b/res/ATTRACT/FORMULA.1.RACER
similarity index 61%
rename from res/ATTRACT/FORMULA.1
rename to res/ATTRACT/FORMULA.1.RACER
index f6caf7d3d..e38291693 100644
--- a/res/ATTRACT/FORMULA.1
+++ b/res/ATTRACT/FORMULA.1.RACER
@@ -2,6 +2,6 @@
 # Attract mode for Formula 1 Racer
 #
 
-ACTION.HGR/FORMULA.1=A
+ACTION.HGR/FORMULA.1.RACER=A
 
 [eof]
diff --git a/res/ATTRACT/GOONIES b/res/ATTRACT/GOONIES
deleted file mode 100644
index 1bb282fa9..000000000
--- a/res/ATTRACT/GOONIES
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Attract mode for The Goonies
-#
-
-ARTWORK.SHR/GOONIES=C
-ACTION.HGR/GOONIES2=A
-ACTION.HGR/GOONIES3=A
-ACTION.HGR/GOONIES4=A
-ACTION.HGR/GOONIES5=A
-ACTION.HGR/GOONIES6=A
-ACTION.HGR/GOONIES=A
-GOONIES=0
-
-[eof]
diff --git a/res/ATTRACT/H.E.R.O b/res/ATTRACT/H.E.R.O
new file mode 100644
index 000000000..43fc5a329
--- /dev/null
+++ b/res/ATTRACT/H.E.R.O
@@ -0,0 +1,8 @@
+#
+# Attract mode for H E R O
+#
+
+ARTWORK.SHR/H.E.R.O=C
+ACTION.HGR/H.E.R.O=A
+
+[eof]
diff --git a/res/ATTRACT/HERO b/res/ATTRACT/HERO
deleted file mode 100644
index 70dbea24f..000000000
--- a/res/ATTRACT/HERO
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Attract mode for H E R O
-#
-
-ARTWORK.SHR/HERO=C
-ACTION.HGR/HERO=A
-
-[eof]
diff --git a/res/ATTRACT/LAST.NINJA b/res/ATTRACT/LAST.NINJA
deleted file mode 100644
index 3f046a1d8..000000000
--- a/res/ATTRACT/LAST.NINJA
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Attract mode for The Last Ninja
-#
-
-ARTWORK.SHR/LAST.NINJA=C
-ACTION.DHGR/LAST.NINJA2=B
-ACTION.DHGR/LAST.NINJA3=B
-ACTION.DHGR/LAST.NINJA4=B
-ACTION.DHGR/LAST.NINJA=B
-
-[eof]
diff --git a/res/ATTRACT/N.O.R.A.D b/res/ATTRACT/N.O.R.A.D
new file mode 100644
index 000000000..044a1c9e2
--- /dev/null
+++ b/res/ATTRACT/N.O.R.A.D
@@ -0,0 +1,8 @@
+#
+# Attract mode for N O R A D
+#
+
+ACTION.HGR/N.O.R.A.D2=A
+ACTION.HGR/N.O.R.A.D=A
+
+[eof]
diff --git a/res/ATTRACT/NORAD b/res/ATTRACT/NORAD
deleted file mode 100644
index f5c2375c2..000000000
--- a/res/ATTRACT/NORAD
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Attract mode for N O R A D
-#
-
-ACTION.HGR/NORAD2=A
-ACTION.HGR/NORAD=A
-
-[eof]
diff --git a/res/ATTRACT/ROBOTRON b/res/ATTRACT/ROBOTRON.2084
similarity index 51%
rename from res/ATTRACT/ROBOTRON
rename to res/ATTRACT/ROBOTRON.2084
index 47a0e3de4..ffa3b76b7 100644
--- a/res/ATTRACT/ROBOTRON
+++ b/res/ATTRACT/ROBOTRON.2084
@@ -2,7 +2,7 @@
 # Attract mode for Robotron 2084
 #
 
-ACTION.HGR/ROBOTRON=A
-ROBOTRON=0
+ACTION.HGR/ROBOTRON.2084=A
+ROBOTRON.2084=0
 
 [eof]
diff --git a/res/ATTRACT/THE.GOONIES b/res/ATTRACT/THE.GOONIES
new file mode 100644
index 000000000..b6c38759c
--- /dev/null
+++ b/res/ATTRACT/THE.GOONIES
@@ -0,0 +1,14 @@
+#
+# Attract mode for The Goonies
+#
+
+ARTWORK.SHR/THE.GOONIES=C
+ACTION.HGR/THE.GOONIES2=A
+ACTION.HGR/THE.GOONIES3=A
+ACTION.HGR/THE.GOONIES4=A
+ACTION.HGR/THE.GOONIES5=A
+ACTION.HGR/THE.GOONIES6=A
+ACTION.HGR/THE.GOONIES=A
+THE.GOONIES=0
+
+[eof]
diff --git a/res/ATTRACT/THE.LAST.NINJA b/res/ATTRACT/THE.LAST.NINJA
new file mode 100644
index 000000000..27910a71f
--- /dev/null
+++ b/res/ATTRACT/THE.LAST.NINJA
@@ -0,0 +1,11 @@
+#
+# Attract mode for The The Last Ninja
+#
+
+ARTWORK.SHR/THE.LAST.NINJA=C
+ACTION.DHGR/THE.LAST.NINJA2=B
+ACTION.DHGR/THE.LAST.NINJA3=B
+ACTION.DHGR/THE.LAST.NINJA4=B
+ACTION.DHGR/THE.LAST.NINJA=B
+
+[eof]
diff --git a/res/ATTRACT/_FileInformation.txt b/res/ATTRACT/_FileInformation.txt
index bbf3a8b76..807aab06a 100644
--- a/res/ATTRACT/_FileInformation.txt
+++ b/res/ATTRACT/_FileInformation.txt
@@ -1,4 +1,4 @@
-AGENT.USA=Type(04),AuxType(8000),Access(C3)
+AGENT.U.S.A=Type(04),AuxType(8000),Access(C3)
 AIRHEART=Type(04),AuxType(8000),Access(C3)
 ALCAZAR=Type(04),AuxType(8000),Access(C3)
 ALIEN.AMBUSH=Type(04),AuxType(8000),Access(C3)
@@ -75,7 +75,7 @@ FIREBIRD=Type(04),AuxType(8000),Access(C3)
 FLAPPLE.BIRD=Type(04),AuxType(8000),Access(C3)
 FLIP.OUT=Type(04),AuxType(8000),Access(C3)
 FORCE.7=Type(04),AuxType(8000),Access(C3)
-FORMULA.1=Type(04),AuxType(8000),Access(C3)
+FORMULA.1.RACER=Type(04),AuxType(8000),Access(C3)
 FREE.FALL=Type(04),AuxType(8000),Access(C3)
 FROGGER=Type(04),AuxType(8000),Access(C3)
 FROGGER.II=Type(04),AuxType(8000),Access(C3)
@@ -88,16 +88,15 @@ GENETIC.DRIFT=Type(04),AuxType(8000),Access(C3)
 GENIUS=Type(04),AuxType(8000),Access(C3)
 GENIUS.2=Type(04),AuxType(8000),Access(C3)
 GOLD.RUSH=Type(04),AuxType(8000),Access(C3)
-GOONIES=Type(04),AuxType(8000),Access(C3)
 GORGON=Type(04),AuxType(8000),Access(C3)
 GREMLINS=Type(04),AuxType(8000),Access(C3)
 GUARDIAN=Type(04),AuxType(8000),Access(C3)
 GUMBALL=Type(04),AuxType(8000),Access(C3)
+H.E.R.O=Type(04),AuxType(8000),Access(C3)
 HADRON=Type(04),AuxType(8000),Access(C3)
 HARD.HAT.MACK=Type(04),AuxType(8000),Access(C3)
 HEAD.ON=Type(04),AuxType(8000),Access(C3)
 HEAVY.BARREL=Type(04),AuxType(8000),Access(C3)
-HERO=Type(04),AuxType(8000),Access(C3)
 HIGH.RISE=Type(04),AuxType(8000),Access(C3)
 HORIZON.V=Type(04),AuxType(8000),Access(C3)
 HUNGRYBOY=Type(04),AuxType(8000),Access(C3)
@@ -118,7 +117,6 @@ LABYRINTH=Type(04),AuxType(8000),Access(C3)
 LADY.TUT=Type(04),AuxType(8000),Access(C3)
 LANCASTER=Type(04),AuxType(8000),Access(C3)
 LASER.BOUNCE=Type(04),AuxType(8000),Access(C3)
-LAST.NINJA=Type(04),AuxType(8000),Access(C3)
 LAZER.SILK=Type(04),AuxType(8000),Access(C3)
 LODE.RUNNER=Type(04),AuxType(8000),Access(C3)
 LOST.TOMB=Type(04),AuxType(8000),Access(C3)
@@ -136,11 +134,11 @@ MR.COOL=Type(04),AuxType(8000),Access(C3)
 MR.DO=Type(04),AuxType(8000),Access(C3)
 MR.ROBOT=Type(04),AuxType(8000),Access(C3)
 MS.PACMAN=Type(04),AuxType(8000),Access(C3)
+N.O.R.A.D=Type(04),AuxType(8000),Access(C3)
 NIBBLER=Type(04),AuxType(8000),Access(C3)
 NIGHT.MISSION=Type(04),AuxType(8000),Access(C3)
 NIGHT.STALKER=Type(04),AuxType(8000),Access(C3)
 NIGHTMARE=Type(04),AuxType(8000),Access(C3)
-NORAD=Type(04),AuxType(8000),Access(C3)
 ONE.ON.ONE=Type(04),AuxType(8000),Access(C3)
 OOTW=Type(04),AuxType(8000),Access(C3)
 ORBITRON=Type(04),AuxType(8000),Access(C3)
@@ -176,7 +174,7 @@ RESCUE.RAIDERS=Type(04),AuxType(8000),Access(C3)
 RIBBIT=Type(04),AuxType(8000),Access(C3)
 ROADBLOCK=Type(04),AuxType(8000),Access(C3)
 ROBOCOP=Type(04),AuxType(8000),Access(C3)
-ROBOTRON=Type(04),AuxType(8000),Access(C3)
+ROBOTRON.2084=Type(04),AuxType(8000),Access(C3)
 RUSSKI.DUCK=Type(04),AuxType(8000),Access(C3)
 SABOTAGE=Type(04),AuxType(8000),Access(C3)
 SAMMY.LIGHTFOOT=Type(04),AuxType(8000),Access(C3)
@@ -228,7 +226,9 @@ TECHNOCOP=Type(04),AuxType(8000),Access(C3)
 TEST.DRIVE=Type(04),AuxType(8000),Access(C3)
 TETRIS=Type(04),AuxType(8000),Access(C3)
 THE.BILESTOAD=Type(04),AuxType(8000),Access(C3)
+THE.GOONIES=Type(04),AuxType(8000),Access(C3)
 THE.HEIST=Type(04),AuxType(8000),Access(C3)
+THE.LAST.NINJA=Type(04),AuxType(8000),Access(C3)
 THEXDER=Type(04),AuxType(8000),Access(C3)
 THIEF=Type(04),AuxType(8000),Access(C3)
 THRESHOLD=Type(04),AuxType(8000),Access(C3)
diff --git a/res/DEMO/AGENT.USA b/res/DEMO/AGENT.U.S.A
old mode 100755
new mode 100644
similarity index 100%
rename from res/DEMO/AGENT.USA
rename to res/DEMO/AGENT.U.S.A
diff --git a/res/DEMO/FORMULA.1 b/res/DEMO/FORMULA.1.RACER
old mode 100755
new mode 100644
similarity index 100%
rename from res/DEMO/FORMULA.1
rename to res/DEMO/FORMULA.1.RACER
diff --git a/res/DEMO/ROBOTRON b/res/DEMO/ROBOTRON.2084
old mode 100755
new mode 100644
similarity index 100%
rename from res/DEMO/ROBOTRON
rename to res/DEMO/ROBOTRON.2084
diff --git a/res/DEMO/GOONIES b/res/DEMO/THE.GOONIES
old mode 100755
new mode 100644
similarity index 100%
rename from res/DEMO/GOONIES
rename to res/DEMO/THE.GOONIES
diff --git a/res/DEMO/_FileInformation.txt b/res/DEMO/_FileInformation.txt
index bc87b29bb..99ea27e45 100644
--- a/res/DEMO/_FileInformation.txt
+++ b/res/DEMO/_FileInformation.txt
@@ -1,4 +1,4 @@
-AGENT.USA=Type(06),AuxType(0300),Access(C3)
+AGENT.U.S.A=Type(06),AuxType(0300),Access(C3)
 AGENT.USA.1=Type(F1),AuxType(0000),Access(C3)
 ALIEN.AMBUSH=Type(06),AuxType(4000),Access(C3)
 ALIEN.DOWNPOUR=Type(06),AuxType(0300),Access(C3)
@@ -59,11 +59,11 @@ FALCONS.1=Type(F1),AuxType(0000),Access(C3)
 FIREBIRD=Type(06),AuxType(0300),Access(C3)
 FIREBIRD.1=Type(F1),AuxType(0000),Access(C3)
 FLIP.OUT=Type(06),AuxType(0BF4),Access(C3)
-FORMULA.1=Type(06),AuxType(0300),Access(C3)
+FORMULA.1.RACER=Type(06),AuxType(0300),Access(C3)
 FORMULA.2=Type(F1),AuxType(0000),Access(C3)
 GAMMA.GOBLINS=Type(06),AuxType(0300),Access(C3)
 GAMMA.GOBLINS.1=Type(F1),AuxType(0000),Access(C3)
-GOONIES=Type(06),AuxType(1000),Access(C3)
+THE.GOONIES=Type(06),AuxType(1000),Access(C3)
 GOONIES.1=Type(F1),AuxType(4C63),Access(C3)
 GOONIES.2=Type(F1),AuxType(4C63),Access(C3)
 GOONIES.3=Type(F1),AuxType(4C63),Access(C3)
@@ -120,7 +120,7 @@ POOYAN=Type(06),AuxType(0300),Access(C3)
 POOYAN.1=Type(F1),AuxType(0000),Access(C3)
 REPTON=Type(06),AuxType(0300),Access(C3)
 REPTON.1=Type(F1),AuxType(0000),Access(C3)
-ROBOTRON=Type(06),AuxType(3000),Access(C3)
+ROBOTRON.2084=Type(06),AuxType(3000),Access(C3)
 ROBOTRON.1=Type(F1),AuxType(0000),Access(C3)
 SAMMY.LIGHTFOOT=Type(06),AuxType(0300),Access(C3)
 SAMMY.1=Type(F1),AuxType(0000),Access(C3)
diff --git a/res/GAMES.CONF b/res/GAMES.CONF
index 093ee023d..59729e84f 100755
--- a/res/GAMES.CONF
+++ b/res/GAMES.CONF
@@ -1,4 +1,4 @@
-0000,AGENT.USA=Agent U S A
+0000,AGENT.U.S.A
 1110,AIRHEART
 0001,ALCAZAR
 1001,ALIEN.AMBUSH
@@ -77,7 +77,7 @@
 0000,FS2=Flight Simulator II
 0000,FLIP.OUT
 1101,FORCE.7
-1000,FORMULA.1=Formula 1 Racer
+1000,FORMULA.1.RACER
 0001,FREE.FALL
 0001,FROGGER
 1001,FROGGER.II=Frogger II
@@ -97,7 +97,7 @@
 0001,HARD.HAT.MACK
 0000,HEAD.ON
 1110,HEAVY.BARREL
-1002,HERO=H E R O
+1002,H.E.R.O
 0000,HIGH.RISE
 0000,HORIZON.V
 0001,HUNGRYBOY
@@ -139,7 +139,7 @@
 1000,NIGHT.MISSION=Night Mission Pinball
 0000,NIGHT.STALKER
 0000,NIGHTMARE=Nightmare Gallery
-0000,NORAD=N O R A D
+0000,N.O.R.A.D
 1000,ONE.ON.ONE=One on One
 0000,ORBITRON
 0000,ORILEYS.MINE=O'Riley's Mine
@@ -175,7 +175,7 @@
 0000,RIBBIT
 0000,ROADBLOCK
 0110,ROBOCOP
-0000,ROBOTRON=Robotron 2084
+0000,ROBOTRON.2084
 0000,RUSSKI.DUCK
 0000,SABOTAGE
 0001,SAMMY.LIGHTFOOT
@@ -226,11 +226,11 @@
 0000,THE.BILESTOAD
 0110,SUMMER.EDITION=The Games: Summer Edition
 0110,WINTER.EDITION=The Games: Winter Edition
-1000,GOONIES=The Goonies
+1000,THE.GOONIES
 0001,SPY.STRIKES.BAK=The Spy Strikes Back
 1111,TEST.DRIVE
 0001,THE.HEIST
-1111,LAST.NINJA=The Last Ninja
+1111,THE.LAST.NINJA
 0010,THEXDER
 0000,THIEF
 0001,THRESHOLD
diff --git a/res/SS/AB2.CONF b/res/SS/AB2.CONF
index 13b371b5e..896717d1c 100644
--- a/res/SS/AB2.CONF
+++ b/res/SS/AB2.CONF
@@ -10,6 +10,6 @@ BEER.RUN
 ALIEN.AMBUSH
 BUZZARD.BAIT
 APPLE.PANIC
-AGENT.USA
+AGENT.U.S.A
 
 [eof]
diff --git a/res/SS/ACTIONAB2.CONF b/res/SS/ACTIONAB2.CONF
index 10780ca0b..8cb0e3014 100644
--- a/res/SS/ACTIONAB2.CONF
+++ b/res/SS/ACTIONAB2.CONF
@@ -4,7 +4,7 @@
 
 BCS.QUEST
 BOLO
-AGENT.USA
+AGENT.U.S.A
 ALCAZAR
 BEYOND.WOLFEN3=BEYOND.WOLFEN
 ARGOS
diff --git a/res/SS/ACTIONEFG1.CONF b/res/SS/ACTIONEFG1.CONF
index da9506cc5..e5a65ef04 100644
--- a/res/SS/ACTIONEFG1.CONF
+++ b/res/SS/ACTIONEFG1.CONF
@@ -4,7 +4,7 @@
 
 GAUNTLET3=GAUNTLET
 GAMMA.GOBLINS3=GAMMA.GOBLINS
-GOONIES3=GOONIES
+THE.GOONIES3=THE.GOONIES
 FROGGER2=FROGGER
 GAMMA.GOBLINS4=GAMMA.GOBLINS
 FALCONS.SCORE=FALCONS
diff --git a/res/SS/ACTIONEFG2.CONF b/res/SS/ACTIONEFG2.CONF
index aedfec30a..c45fcf33c 100644
--- a/res/SS/ACTIONEFG2.CONF
+++ b/res/SS/ACTIONEFG2.CONF
@@ -3,12 +3,12 @@
 #
 
 GENIUSC=GENIUS
-GOONIES
+THE.GOONIES
 GAMMA.GOBLINS5=GAMMA.GOBLINS
 FROGGER
 FORCE.72=FORCE.7
 FREE.FALL
-GOONIES5=GOONIES
+THE.GOONIES5=THE.GOONIES
 EPOCH
 GAMMA.GOBLINS2=GAMMA.GOBLINS
 GORGON
diff --git a/res/SS/ACTIONEFG3.CONF b/res/SS/ACTIONEFG3.CONF
index 35592e3ae..83e5db458 100644
--- a/res/SS/ACTIONEFG3.CONF
+++ b/res/SS/ACTIONEFG3.CONF
@@ -3,10 +3,10 @@
 #
 
 GAUNTLET2=GAUNTLET
-GOONIES6=GOONIES
+THE.GOONIES6=THE.GOONIES
 FS2
 GENIUSB=GENIUS
-FORMULA.1
+FORMULA.1.RACER
 GUARDIAN2=GUARDIAN
 FORCE.73=FORCE.7
 GAMMA.GOBLINS
diff --git a/res/SS/ACTIONEFG4.CONF b/res/SS/ACTIONEFG4.CONF
index 641ea5545..d1ea92241 100644
--- a/res/SS/ACTIONEFG4.CONF
+++ b/res/SS/ACTIONEFG4.CONF
@@ -7,7 +7,7 @@ FROGGER.II
 GALAXY.GATES
 FREE.FALL2=FREE.FALL
 GUARDIAN
-GOONIES2=GOONIES
+THE.GOONIES2=THE.GOONIES
 FORCE.74=FORCE.7
 GENIUS
 GOLD.RUSH
diff --git a/res/SS/ACTIONEFG5.CONF b/res/SS/ACTIONEFG5.CONF
index 30b611e6b..033540b3e 100644
--- a/res/SS/ACTIONEFG5.CONF
+++ b/res/SS/ACTIONEFG5.CONF
@@ -3,7 +3,7 @@
 #
 
 GAUNTLET
-GOONIES4=GOONIES
+THE.GOONIES4=THE.GOONIES
 FLIP.OUT
 GENIUS.2B=GENIUS.2
 GENETIC.DRIFT
diff --git a/res/SS/ACTIONHIJ1.CONF b/res/SS/ACTIONHIJ1.CONF
index 8563be4e7..7e18771a2 100644
--- a/res/SS/ACTIONHIJ1.CONF
+++ b/res/SS/ACTIONHIJ1.CONF
@@ -3,7 +3,7 @@
 #
 
 KARATEKA
-HERO
+H.E.R.O
 HARD.HAT.MACK2=HARD.HAT.MACK
 JOUST2=JOUST
 IKARI.WARRIORS
diff --git a/res/SS/ACTIONMNO1.CONF b/res/SS/ACTIONMNO1.CONF
index 474045432..4723242cb 100644
--- a/res/SS/ACTIONMNO1.CONF
+++ b/res/SS/ACTIONMNO1.CONF
@@ -6,7 +6,7 @@ MR.DO.L01=MR.DO
 ORILEYS.MINE
 MONTEZUMA01=MONTEZUMA
 MINER.2049ER
-NORAD
+N.O.R.A.D
 ORBITRON
 MARIO.BROS3=MARIO.BROS
 MS.PACMAN
diff --git a/res/SS/ACTIONMNO2.CONF b/res/SS/ACTIONMNO2.CONF
index 2074fba51..61ec5426d 100644
--- a/res/SS/ACTIONMNO2.CONF
+++ b/res/SS/ACTIONMNO2.CONF
@@ -8,7 +8,7 @@ MOON.PATROL
 ONE.ON.ONE2=ONE.ON.ONE
 NIBBLER
 NIGHTMARE
-NORAD2=NORAD
+N.O.R.A.D2=N.O.R.A.D
 OUTPOST
 MR.DO.L10=MR.DO
 
diff --git a/res/SS/ACTIVISION.CONF b/res/SS/ACTIVISION.CONF
index ff2817128..4d0228459 100644
--- a/res/SS/ACTIVISION.CONF
+++ b/res/SS/ACTIVISION.CONF
@@ -3,7 +3,7 @@
 #
 
 ALCAZAR
-HERO
+H.E.R.O
 PITFALL.II
 
 [eof]
diff --git a/res/SS/DATASOFT2.CONF b/res/SS/DATASOFT2.CONF
index 971d236f8..00314d0ca 100644
--- a/res/SS/DATASOFT2.CONF
+++ b/res/SS/DATASOFT2.CONF
@@ -5,7 +5,7 @@
 BRUCE.LEE
 CONAN
 POOYAN
-GOONIES
+THE.GOONIES
 THIEF
 LOST.TOMB
 ORILEYS.MINE
diff --git a/res/SS/EFG1.CONF b/res/SS/EFG1.CONF
index c46a0b2a8..a858bd758 100644
--- a/res/SS/EFG1.CONF
+++ b/res/SS/EFG1.CONF
@@ -10,7 +10,7 @@ GORGON
 GREMLINS
 GENETIC.DRIFT
 FS2
-GOONIES
+THE.GOONIES
 GAMMA.GOBLINS
 
 [eof]
diff --git a/res/SS/EFG2.CONF b/res/SS/EFG2.CONF
index 5570c24ea..b2575f0a0 100644
--- a/res/SS/EFG2.CONF
+++ b/res/SS/EFG2.CONF
@@ -8,7 +8,7 @@ GUARDIAN
 GUMBALL
 FROGGER.II
 EGGS.IT
-FORMULA.1
+FORMULA.1.RACER
 FORCE.7
 GOLD.RUSH
 GALAXY.GATES
diff --git a/res/SS/FAVORITES1.CONF b/res/SS/FAVORITES1.CONF
index 17407e7ab..7c5a2878e 100644
--- a/res/SS/FAVORITES1.CONF
+++ b/res/SS/FAVORITES1.CONF
@@ -10,7 +10,7 @@ TETRIS
 TAPPER
 TUBEWAY
 POOYAN
-GOONIES
+THE.GOONIES
 PLASMANIA
 
 [eof]
diff --git a/res/SS/FAVORITES2.CONF b/res/SS/FAVORITES2.CONF
index 4f22a2719..6a9825b1b 100644
--- a/res/SS/FAVORITES2.CONF
+++ b/res/SS/FAVORITES2.CONF
@@ -5,7 +5,7 @@
 MR.ROBOT
 PITFALL.II
 MOON.PATROL
-HERO
+H.E.R.O
 DROL
 BRUCE.LEE
 RESCUE.RAIDERS
diff --git a/res/SS/HIJKL.CONF b/res/SS/HIJKL.CONF
index 0932fb1ca..3479d2521 100644
--- a/res/SS/HIJKL.CONF
+++ b/res/SS/HIJKL.CONF
@@ -5,7 +5,7 @@
 LOST.TOMB
 JUGGLER
 LADY.TUT
-HERO
+H.E.R.O
 JUNGLE.HUNT
 HUNGRYBOY
 HIGH.RISE
diff --git a/res/SS/MNO2.CONF b/res/SS/MNO2.CONF
index 9563d0e95..b6e3e07c5 100644
--- a/res/SS/MNO2.CONF
+++ b/res/SS/MNO2.CONF
@@ -10,7 +10,7 @@ MR.DO
 OUTPOST
 NIBBLER
 NIGHT.MISSION
-NORAD
+N.O.R.A.D
 MINGS.CHALLENGE
 
 [eof]
diff --git a/res/SS/MNO3.CONF b/res/SS/MNO3.CONF
index fd34af3b5..64d5d2450 100644
--- a/res/SS/MNO3.CONF
+++ b/res/SS/MNO3.CONF
@@ -8,7 +8,7 @@ MAD.BOMBER
 MR.DO
 OUTPOST
 NIBBLER
-NORAD
+N.O.R.A.D
 MINGS.CHALLENGE
 ONE.ON.ONE
 MINER.2049.II
diff --git a/res/SS/OTHER1.CONF b/res/SS/OTHER1.CONF
index aa001e0f3..63e638f60 100644
--- a/res/SS/OTHER1.CONF
+++ b/res/SS/OTHER1.CONF
@@ -8,9 +8,9 @@ SPIDER.RAID
 INTL.GRAN.PRIX
 BERZAP
 RESCUE.RAIDERS
-FORMULA.1
+FORMULA.1.RACER
 GUARDIAN
-NORAD
+N.O.R.A.D
 BUDGETRILOGY
 
 [eof]
diff --git a/res/SS/SHR2.CONF b/res/SS/SHR2.CONF
index 2a58efb68..3389e8af2 100644
--- a/res/SS/SHR2.CONF
+++ b/res/SS/SHR2.CONF
@@ -4,7 +4,7 @@
 
 PRINCEUNP
 SNAKE.BYTE
-AGENT.USA
+AGENT.U.S.A
 CANNONBALL.BLTZ
 ALCAZAR
 
diff --git a/res/SS/SHR5.CONF b/res/SS/SHR5.CONF
index 8e81587c4..bb0f20807 100644
--- a/res/SS/SHR5.CONF
+++ b/res/SS/SHR5.CONF
@@ -4,7 +4,7 @@
 
 DRELBS
 DROL
-GOONIES
+THE.GOONIES
 GORGON
 HARD.HAT.MACK
 
diff --git a/res/SS/SHR6.CONF b/res/SS/SHR6.CONF
index d73d3fe65..94e70eee6 100644
--- a/res/SS/SHR6.CONF
+++ b/res/SS/SHR6.CONF
@@ -2,7 +2,7 @@
 # super hi-res slideshow
 #
 
-HERO
+H.E.R.O
 IMPOSSIBLE.MISS
 JUMPMAN
 KARATEKA
diff --git a/res/TITLE.DHGR/LAST.NINJA b/res/TITLE.DHGR/THE.LAST.NINJA
similarity index 100%
rename from res/TITLE.DHGR/LAST.NINJA
rename to res/TITLE.DHGR/THE.LAST.NINJA
diff --git a/res/TITLE.DHGR/_FileInformation.txt b/res/TITLE.DHGR/_FileInformation.txt
index cc433dd58..cac944251 100644
--- a/res/TITLE.DHGR/_FileInformation.txt
+++ b/res/TITLE.DHGR/_FileInformation.txt
@@ -8,7 +8,6 @@ D.GENERATION=Type(06),AuxType(4000),Access(C3)
 DEATH.SWORD=Type(06),AuxType(4000),Access(C3)
 HEAVY.BARREL=Type(06),AuxType(4000),Access(C3)
 INDIANA.JONES=Type(06),AuxType(4000),Access(C3)
-LAST.NINJA=Type(06),AuxType(4000),Access(C3)
 MATTERHORN=Type(06),AuxType(4000),Access(C3)
 PIPE.DREAM=Type(06),AuxType(4000),Access(C3)
 PLATOON=Type(06),AuxType(4000),Access(C3)
@@ -28,6 +27,7 @@ SUMMER.EDITION=Type(06),AuxType(4000),Access(C3)
 TECHNOCOP=Type(06),AuxType(4000),Access(C3)
 TEST.DRIVE=Type(06),AuxType(4000),Access(C3)
 TETRIS=Type(06),AuxType(4000),Access(C3)
+THE.LAST.NINJA=Type(06),AuxType(4000),Access(C3)
 THEXDER=Type(06),AuxType(4000),Access(C3)
 VICTORY.ROAD=Type(06),AuxType(4000),Access(C3)
 WINGS.OF.FURY=Type(06),AuxType(4000),Access(C3)
diff --git a/res/TITLE.HGR/AGENT.USA b/res/TITLE.HGR/AGENT.U.S.A
similarity index 100%
rename from res/TITLE.HGR/AGENT.USA
rename to res/TITLE.HGR/AGENT.U.S.A
diff --git a/res/TITLE.HGR/FORMULA.1 b/res/TITLE.HGR/FORMULA.1.RACER
similarity index 100%
rename from res/TITLE.HGR/FORMULA.1
rename to res/TITLE.HGR/FORMULA.1.RACER
diff --git a/res/TITLE.HGR/HERO b/res/TITLE.HGR/H.E.R.O
similarity index 100%
rename from res/TITLE.HGR/HERO
rename to res/TITLE.HGR/H.E.R.O
diff --git a/res/TITLE.HGR/NORAD b/res/TITLE.HGR/N.O.R.A.D
similarity index 100%
rename from res/TITLE.HGR/NORAD
rename to res/TITLE.HGR/N.O.R.A.D
diff --git a/res/TITLE.HGR/ROBOTRON b/res/TITLE.HGR/ROBOTRON.2084
similarity index 100%
rename from res/TITLE.HGR/ROBOTRON
rename to res/TITLE.HGR/ROBOTRON.2084
diff --git a/res/TITLE.HGR/GOONIES b/res/TITLE.HGR/THE.GOONIES
similarity index 100%
rename from res/TITLE.HGR/GOONIES
rename to res/TITLE.HGR/THE.GOONIES
diff --git a/res/TITLE.HGR/_FileInformation.txt b/res/TITLE.HGR/_FileInformation.txt
index e61d5b2b2..9846715f2 100644
--- a/res/TITLE.HGR/_FileInformation.txt
+++ b/res/TITLE.HGR/_FileInformation.txt
@@ -1,4 +1,4 @@
-AGENT.USA=Type(06),AuxType(4000),Access(C3)
+AGENT.U.S.A=Type(06),AuxType(4000),Access(C3)
 ALCAZAR=Type(06),AuxType(4000),Access(C3)
 ALIEN.AMBUSH=Type(06),AuxType(4000),Access(C3)
 ALIEN.DOWNPOUR=Type(06),AuxType(4000),Access(C3)
@@ -68,7 +68,7 @@ FIREBIRD=Type(06),AuxType(4000),Access(C3)
 FLAPPLE.BIRD=Type(06),AuxType(4000),Access(C3)
 FLIP.OUT=Type(06),AuxType(4000),Access(C3)
 FORCE.7=Type(06),AuxType(4000),Access(C3)
-FORMULA.1=Type(06),AuxType(4000),Access(C3)
+FORMULA.1.RACER=Type(06),AuxType(4000),Access(C3)
 FREE.FALL=Type(06),AuxType(4000),Access(C3)
 FROGGER=Type(06),AuxType(4000),Access(C3)
 FROGGER.II=Type(06),AuxType(4000),Access(C3)
@@ -81,15 +81,14 @@ GENETIC.DRIFT=Type(06),AuxType(4000),Access(C3)
 GENIUS=Type(06),AuxType(4000),Access(C3)
 GENIUS.2=Type(06),AuxType(4000),Access(C3)
 GOLD.RUSH=Type(06),AuxType(4000),Access(C3)
-GOONIES=Type(06),AuxType(4000),Access(C3)
 GORGON=Type(06),AuxType(4000),Access(C3)
 GREMLINS=Type(06),AuxType(4000),Access(C3)
 GUARDIAN=Type(06),AuxType(4000),Access(C3)
 GUMBALL=Type(06),AuxType(4000),Access(C3)
+H.E.R.O=Type(06),AuxType(4000),Access(C3)
 HADRON=Type(06),AuxType(4000),Access(C3)
 HARD.HAT.MACK=Type(06),AuxType(4000),Access(C3)
 HEAD.ON=Type(06),AuxType(4000),Access(C3)
-HERO=Type(06),AuxType(4000),Access(C3)
 HIGH.RISE=Type(06),AuxType(4000),Access(C3)
 HORIZON.V=Type(06),AuxType(4000),Access(C3)
 HUNGRYBOY=Type(06),AuxType(4000),Access(C3)
@@ -125,11 +124,11 @@ MR.COOL=Type(06),AuxType(4000),Access(C3)
 MR.DO=Type(06),AuxType(4000),Access(C3)
 MR.ROBOT=Type(06),AuxType(4000),Access(C3)
 MS.PACMAN=Type(06),AuxType(4000),Access(C3)
+N.O.R.A.D=Type(06),AuxType(4000),Access(C3)
 NIBBLER=Type(06),AuxType(4000),Access(C3)
 NIGHT.MISSION=Type(06),AuxType(4000),Access(C3)
 NIGHT.STALKER=Type(06),AuxType(4000),Access(C3)
 NIGHTMARE=Type(06),AuxType(4000),Access(C3)
-NORAD=Type(06),AuxType(4000),Access(C3)
 ONE.ON.ONE=Type(06),AuxType(4000),Access(C3)
 OOTW=Type(06),AuxType(4000),Access(C3)
 ORBITRON=Type(06),AuxType(4000),Access(C3)
@@ -157,7 +156,7 @@ REPTON=Type(06),AuxType(4000),Access(C3)
 RESCUE.RAIDERS=Type(06),AuxType(4000),Access(C3)
 RIBBIT=Type(06),AuxType(4000),Access(C3)
 ROADBLOCK=Type(06),AuxType(4000),Access(C3)
-ROBOTRON=Type(06),AuxType(4000),Access(C3)
+ROBOTRON.2084=Type(06),AuxType(4000),Access(C3)
 RUSSKI.DUCK=Type(06),AuxType(4000),Access(C3)
 SABOTAGE=Type(06),AuxType(4000),Access(C3)
 SAMMY.LIGHTFOOT=Type(06),AuxType(4000),Access(C3)
@@ -200,6 +199,7 @@ TAG.TEAM=Type(06),AuxType(4000),Access(C3)
 TAPPER=Type(06),AuxType(4000),Access(C3)
 TETRIS=Type(06),AuxType(4000),Access(C3)
 THE.BILESTOAD=Type(06),AuxType(4000),Access(C3)
+THE.GOONIES=Type(06),AuxType(4000),Access(C3)
 THE.HEIST=Type(06),AuxType(4000),Access(C3)
 THEXDER=Type(06),AuxType(4000),Access(C3)
 THIEF=Type(06),AuxType(4000),Access(C3)
diff --git a/res/dsk/agent usa 22k file PRODOS (san inc pack).po b/res/dsk/agent usa 22k file PRODOS (san inc pack).po
index 2128a4cfd..30c4bf61e 100644
Binary files a/res/dsk/agent usa 22k file PRODOS (san inc pack).po and b/res/dsk/agent usa 22k file PRODOS (san inc pack).po differ
diff --git a/res/dsk/formula 1 racer 9k file PRODOS (san inc pack).po b/res/dsk/formula 1 racer 9k file PRODOS (san inc pack).po
index faaecc9ae..fcf0da2f8 100644
Binary files a/res/dsk/formula 1 racer 9k file PRODOS (san inc pack).po and b/res/dsk/formula 1 racer 9k file PRODOS (san inc pack).po differ
diff --git a/res/dsk/goonies PRODOS (san inc pack).po b/res/dsk/goonies PRODOS (san inc pack).po
index 80e2f3762..0c97a9cd6 100644
Binary files a/res/dsk/goonies PRODOS (san inc pack).po and b/res/dsk/goonies PRODOS (san inc pack).po differ
diff --git a/res/dsk/hero 12k file PRODOS (san inc pack) (fixes refresh bug in original game).po b/res/dsk/hero 12k file PRODOS (san inc pack) (fixes refresh bug in original game).po
index 561946a65..88dd172eb 100644
Binary files a/res/dsk/hero 12k file PRODOS (san inc pack) (fixes refresh bug in original game).po and b/res/dsk/hero 12k file PRODOS (san inc pack) (fixes refresh bug in original game).po differ
diff --git a/res/dsk/norad 7k file PRODOS (san inc pack).po b/res/dsk/norad 7k file PRODOS (san inc pack).po
index 5e4c224d4..502865d4c 100644
Binary files a/res/dsk/norad 7k file PRODOS (san inc pack).po and b/res/dsk/norad 7k file PRODOS (san inc pack).po differ
diff --git a/res/dsk/robotron 2084 13k file PRODOS (san inc pack).po b/res/dsk/robotron 2084 13k file PRODOS (san inc pack).po
index bac01c8ad..4fb21a44d 100644
Binary files a/res/dsk/robotron 2084 13k file PRODOS (san inc pack).po and b/res/dsk/robotron 2084 13k file PRODOS (san inc pack).po differ
diff --git a/res/dsk/the last ninja PRODOS (san inc crack).po b/res/dsk/the last ninja PRODOS (san inc crack).po
index e8391d426..f62339953 100644
Binary files a/res/dsk/the last ninja PRODOS (san inc crack).po and b/res/dsk/the last ninja PRODOS (san inc crack).po differ
diff --git a/src/constants.a b/src/constants.a
index 8bf1ff1b3..a9f165caa 100644
--- a/src/constants.a
+++ b/src/constants.a
@@ -6,9 +6,9 @@
 ; YE OLDE GRAND UNIFIED MEMORY MAP
 ;
 ; LC RAM BANK 1
-; D000..E2FB - persistent data structures (gGlobalPrefsStore, gGamesListStore)
+; D000..E2DD - persistent data structures (gGlobalPrefsStore, gGamesListStore)
 ; ...unused...
-; EA95..FFF8 - main program code
+; EA7B..FFF8 - main program code
 ; FFFA..FFFF - NMI, reset, IRQ vectors
 ;
 ; LC RAM BANK 2