diff --git a/scripts/object/tangible/terminal/terminal_bank.py b/scripts/object/tangible/terminal/terminal_bank.py
index 64205c68..0a27868e 100644
--- a/scripts/object/tangible/terminal/terminal_bank.py
+++ b/scripts/object/tangible/terminal/terminal_bank.py
@@ -2,6 +2,6 @@ import sys
 
 def setup(core, object):
 	object.setAttachment('radial_filename', 'terminal/bank')
-	core.mapService.addLocation(object.getPlanet(), 'Bank Terminal', object.getPosition().x, object.getPosition().z, 41, 42, 0)
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_bank', object.getPosition().x, object.getPosition().z, 2, 42, 0)
 	return
 	
\ No newline at end of file
diff --git a/scripts/object/tangible/terminal/terminal_bazaar.py b/scripts/object/tangible/terminal/terminal_bazaar.py
index e94866f0..967ff912 100644
--- a/scripts/object/tangible/terminal/terminal_bazaar.py
+++ b/scripts/object/tangible/terminal/terminal_bazaar.py
@@ -1,7 +1,6 @@
 import sys
 
 def setup(core, object):
-
-	core.mapService.addLocation(object.getPlanet(), 'Bazaar Terminal', object.getPosition().x, object.getPosition().z, 41, 43, 0)
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_bazaar', object.getPosition().x, object.getPosition().z, 41, 43, 0)
 	return
 	
\ No newline at end of file
diff --git a/scripts/object/tangible/terminal/terminal_city_junk_dealer.py b/scripts/object/tangible/terminal/terminal_city_junk_dealer.py
index ccad8904..f09f88cc 100644
--- a/scripts/object/tangible/terminal/terminal_city_junk_dealer.py
+++ b/scripts/object/tangible/terminal/terminal_city_junk_dealer.py
@@ -1,4 +1,5 @@
 import sys
 
 def setup(core, object):
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:junk_dealer', object.getPosition().x, object.getPosition().z, 26, 81, 0)
 	return
\ No newline at end of file
diff --git a/scripts/object/tangible/terminal/terminal_cloning.py b/scripts/object/tangible/terminal/terminal_cloning.py
index dc256f9a..46138012 100644
--- a/scripts/object/tangible/terminal/terminal_cloning.py
+++ b/scripts/object/tangible/terminal/terminal_cloning.py
@@ -2,5 +2,6 @@ import sys
 
 def setup(core, object):
 	object.setAttachment('radial_filename', 'terminal/cloning_terminal')
+	
 	return
 	
\ No newline at end of file
diff --git a/scripts/object/tangible/terminal/terminal_mission_artisan.py b/scripts/object/tangible/terminal/terminal_mission_artisan.py
index 911010d8..6bface4e 100644
--- a/scripts/object/tangible/terminal/terminal_mission_artisan.py
+++ b/scripts/object/tangible/terminal/terminal_mission_artisan.py
@@ -2,6 +2,6 @@ import sys
 
 def setup(core, object):
 
-	core.mapService.addLocation(object.getPlanet(), 'Artisan Mission Terminal', object.getPosition().x, object.getPosition().z, 41, 21, 0)
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_mission_artisan', object.getPosition().x, object.getPosition().z, 41, 76, 0)
 	return
 	
\ No newline at end of file
diff --git a/scripts/object/tangible/terminal/terminal_mission_entertainer.py b/scripts/object/tangible/terminal/terminal_mission_entertainer.py
index 433b5f91..31bc4a90 100644
--- a/scripts/object/tangible/terminal/terminal_mission_entertainer.py
+++ b/scripts/object/tangible/terminal/terminal_mission_entertainer.py
@@ -1,7 +1,6 @@
 import sys
 
 def setup(core, object):
-
-	core.mapService.addLocation(object.getPlanet(), 'Entertainer Mission Terminal', object.getPosition().x, object.getPosition().z, 41, 24, 0)
-	return
-	
\ No newline at end of file
+	object.setAttachment("terminalType", 2)
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_mission_entertainer', object.getPosition().x, object.getPosition().z, 41, 75, 0)
+	return
\ No newline at end of file
diff --git a/scripts/object/tangible/terminal/terminal_mission_imperial.py b/scripts/object/tangible/terminal/terminal_mission_imperial.py
index 8e4773b5..216f3bfc 100644
--- a/scripts/object/tangible/terminal/terminal_mission_imperial.py
+++ b/scripts/object/tangible/terminal/terminal_mission_imperial.py
@@ -1,7 +1,6 @@
 import sys
 
 def setup(core, object):
-
-	core.mapService.addLocation(object.getPlanet(), 'Imperial Mission Terminal', object.getPosition().x, object.getPosition().z, 41, 46, 0)
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_mission_imperial', object.getPosition().x, object.getPosition().z, 41, 80, 0)
 	return
 	
\ No newline at end of file
diff --git a/scripts/object/tangible/terminal/terminal_mission_rebel.py b/scripts/object/tangible/terminal/terminal_mission_rebel.py
index 0bb50bbe..f435f149 100644
--- a/scripts/object/tangible/terminal/terminal_mission_rebel.py
+++ b/scripts/object/tangible/terminal/terminal_mission_rebel.py
@@ -1,7 +1,6 @@
 import sys
 
 def setup(core, object):
-
-	core.mapService.addLocation(object.getPlanet(), 'Rebel Mission Terminal', object.getPosition().x, object.getPosition().z, 41, 45, 0)
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_mission_rebel', object.getPosition().x, object.getPosition().z, 41, 79, 0)
 	return
 	
\ No newline at end of file
diff --git a/scripts/object/tangible/terminal/terminal_mission_scout.py b/scripts/object/tangible/terminal/terminal_mission_scout.py
index ccad8904..eb7c1e2a 100644
--- a/scripts/object/tangible/terminal/terminal_mission_scout.py
+++ b/scripts/object/tangible/terminal/terminal_mission_scout.py
@@ -1,4 +1,5 @@
 import sys
 
 def setup(core, object):
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_mission_scout', object.getPosition().x, object.getPosition().z, 41, 77, 0)
 	return
\ No newline at end of file