diff --git a/scripts/mobiles/corellia/bloated_gubbur.py b/scripts/mobiles/corellia/bloated_gubbur.py
index 3f346c62..d47764f3 100644
--- a/scripts/mobiles/corellia/bloated_gubbur.py
+++ b/scripts/mobiles/corellia/bloated_gubbur.py
@@ -6,7 +6,7 @@ from java.util import Vector
 def addTemplate(core):
 	mobileTemplate = MobileTemplate()
 	
-	mobileTemplate.setCreatureName('bloated_gubbur')
+	mobileTemplate.setCreatureName('gubbur_bloated')
 	mobileTemplate.setLevel(23)
 	mobileTemplate.setMinLevel(23)
 	mobileTemplate.setMaxLevel(23)
diff --git a/scripts/mobiles/lok/aged_kimogila.py b/scripts/mobiles/lok/aged_kimogila.py
index d4e7c281..6236b4a3 100644
--- a/scripts/mobiles/lok/aged_kimogila.py
+++ b/scripts/mobiles/lok/aged_kimogila.py
@@ -6,7 +6,7 @@ from java.util import Vector
 def addTemplate(core):
 	mobileTemplate = MobileTemplate()
 	
-	mobileTemplate.setCreatureName('aged_kimogoila')
+	mobileTemplate.setCreatureName('kimogila_aged')
 	mobileTemplate.setLevel(79)
 	mobileTemplate.setMinLevel(79)
 	mobileTemplate.setMaxLevel(80)
diff --git a/scripts/mobiles/mustafar/Blistmok_Shrieker.py b/scripts/mobiles/mustafar/Blistmok_Shrieker.py
index eabe8917..e27971d5 100644
--- a/scripts/mobiles/mustafar/Blistmok_Shrieker.py
+++ b/scripts/mobiles/mustafar/Blistmok_Shrieker.py
@@ -6,7 +6,7 @@ from java.util import Vector
 def addTemplate(core):
 	mobileTemplate = MobileTemplate()
 	
-	mobileTemplate.setCreatureName('Blistmok_Shrieker')
+	mobileTemplate.setCreatureName('som_blistmok_shrieker')
 	mobileTemplate.setLevel(82)
 	mobileTemplate.setMinLevel(82)
 	mobileTemplate.setMaxLevel(82)
diff --git a/scripts/mobiles/mustafar/Blistmok_Trampler.py b/scripts/mobiles/mustafar/Blistmok_Trampler.py
index e3fd1f54..cb9a088d 100644
--- a/scripts/mobiles/mustafar/Blistmok_Trampler.py
+++ b/scripts/mobiles/mustafar/Blistmok_Trampler.py
@@ -6,7 +6,7 @@ from java.util import Vector
 def addTemplate(core):
 	mobileTemplate = MobileTemplate()
 	
-	mobileTemplate.setCreatureName('Blistmok_Trampler')
+	mobileTemplate.setCreatureName('som_blistmok_trampler')
 	mobileTemplate.setLevel(82)
 	mobileTemplate.setMinLevel(82)
 	mobileTemplate.setMaxLevel(82)
diff --git a/scripts/mobiles/mustafar/ancient_jundak.py b/scripts/mobiles/mustafar/ancient_jundak.py
index 242d1cd1..8f9d4aab 100644
--- a/scripts/mobiles/mustafar/ancient_jundak.py
+++ b/scripts/mobiles/mustafar/ancient_jundak.py
@@ -6,7 +6,7 @@ from java.util import Vector
 def addTemplate(core):
 	mobileTemplate = MobileTemplate()
 	
-	mobileTemplate.setCreatureName('Ancient_Jundak')
+	mobileTemplate.setCreatureName('som_ancient_jundak')
 	mobileTemplate.setLevel(84)
 	mobileTemplate.setMinLevel(84)
 	mobileTemplate.setMaxLevel(84)
diff --git a/scripts/mobiles/mustafar/ancient_tulrus.py b/scripts/mobiles/mustafar/ancient_tulrus.py
index 55ea5634..3ad8e4cc 100644
--- a/scripts/mobiles/mustafar/ancient_tulrus.py
+++ b/scripts/mobiles/mustafar/ancient_tulrus.py
@@ -6,7 +6,7 @@ from java.util import Vector
 def addTemplate(core):
 	mobileTemplate = MobileTemplate()
 	
-	mobileTemplate.setCreatureName('ancient_tulrus')
+	mobileTemplate.setCreatureName('som_nesting_grounds_tulrus_ancient')
 	mobileTemplate.setLevel(82)
 	mobileTemplate.setMinLevel(82)
 	mobileTemplate.setMaxLevel(83)
diff --git a/scripts/mobiles/mustafar/blistmok_crystal_charger.py b/scripts/mobiles/mustafar/blistmok_crystal_stalker.py
similarity index 87%
rename from scripts/mobiles/mustafar/blistmok_crystal_charger.py
rename to scripts/mobiles/mustafar/blistmok_crystal_stalker.py
index 1f6df058..a53407aa 100644
--- a/scripts/mobiles/mustafar/blistmok_crystal_charger.py
+++ b/scripts/mobiles/mustafar/blistmok_crystal_stalker.py
@@ -6,7 +6,7 @@ from java.util import Vector
 def addTemplate(core):
 	mobileTemplate = MobileTemplate()
 	
-	mobileTemplate.setCreatureName('blistmok_crystal_charger')
+	mobileTemplate.setCreatureName('som_crystal_flats_blistmok_crystal_stalker')
 	mobileTemplate.setLevel(72)
 	mobileTemplate.setMinLevel(72)
 	mobileTemplate.setMaxLevel(72)
@@ -40,5 +40,5 @@ def addTemplate(core):
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	
-	core.spawnService.addMobileTemplate('blistmok_crystal_charger', mobileTemplate)
+	core.spawnService.addMobileTemplate('blistmok_crystal_stalker', mobileTemplate)
 	return
\ No newline at end of file
diff --git a/scripts/mobiles/mustafar/bloated_jundak.py b/scripts/mobiles/mustafar/bloated_jundak.py
index 1c973ab2..79b1078c 100644
--- a/scripts/mobiles/mustafar/bloated_jundak.py
+++ b/scripts/mobiles/mustafar/bloated_jundak.py
@@ -6,7 +6,7 @@ from java.util import Vector
 def addTemplate(core):
 	mobileTemplate = MobileTemplate()
 	
-	mobileTemplate.setCreatureName('bloated_jundak')
+	mobileTemplate.setCreatureName('som_nesting_grounds_jundak_bloated')
 	mobileTemplate.setLevel(84)
 	mobileTemplate.setMinLevel(84)
 	mobileTemplate.setMaxLevel(84)
diff --git a/scripts/mobiles/talus/brood_i_arachne.py b/scripts/mobiles/talus/brood_i_arachne.py
index 0332be1d..d20c9123 100644
--- a/scripts/mobiles/talus/brood_i_arachne.py
+++ b/scripts/mobiles/talus/brood_i_arachne.py
@@ -6,7 +6,7 @@ from java.util import Vector
 def addTemplate(core):
 	mobileTemplate = MobileTemplate()
 	
-	mobileTemplate.setCreatureName('talas_nashal_brood1_arachne')
+	mobileTemplate.setCreatureName('talus_nashal_brood1_arachne')
 	mobileTemplate.setLevel(41)
 	mobileTemplate.setMinLevel(41)
 	mobileTemplate.setMaxLevel(41)