diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index 064f8b675f..6fd3e5ba3b 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -218,8 +218,8 @@
 
 /proc/random_unique_moth_name(attempts_to_find_unique_name=10)
 	for(var/i in 1 to attempts_to_find_unique_name)
-		. = capitalize(moth_name())
-
+		. = capitalize(pick(GLOB.moth_first)) + " " + capitalize(pick(GLOB.moth_last))
+	
 		if(!findname(.))
 			break
 
diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm
index a1791a55db..09e0aa95b9 100644
--- a/code/__HELPERS/names.dm
+++ b/code/__HELPERS/names.dm
@@ -8,7 +8,7 @@
 	return "[pick(GLOB.plasmaman_names)] \Roman[rand(1,99)]"
 
 /proc/moth_name()
-	return "[pick(GLOB.moth_names)]"
+	return "[pick(GLOB.moth_first)] [pick(GLOB.moth_last)]"
 
 /proc/church_name()
 	var/static/church_name
diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm
index eaaa2c1755..0a9818d49a 100644
--- a/code/_globalvars/lists/names.dm
+++ b/code/_globalvars/lists/names.dm
@@ -13,7 +13,8 @@ GLOBAL_LIST_INIT(clown_names, world.file2list("strings/names/clown.txt"))
 GLOBAL_LIST_INIT(mime_names, world.file2list("strings/names/mime.txt"))
 GLOBAL_LIST_INIT(carp_names, world.file2list("strings/names/carp.txt"))
 GLOBAL_LIST_INIT(golem_names, world.file2list("strings/names/golem.txt"))
-GLOBAL_LIST_INIT(moth_names, world.file2list("strings/names/moth.txt"))
+GLOBAL_LIST_INIT(moth_first, world.file2list("strings/names/moth_first.txt"))
+GLOBAL_LIST_INIT(moth_last, world.file2list("strings/names/moth_last.txt"))
 GLOBAL_LIST_INIT(plasmaman_names, world.file2list("strings/names/plasmaman.txt"))
 GLOBAL_LIST_INIT(posibrain_names, world.file2list("strings/names/posibrain.txt"))
 GLOBAL_LIST_INIT(nightmare_names, world.file2list("strings/names/nightmare.txt"))
diff --git a/strings/names/moth.txt b/strings/names/moth.txt
deleted file mode 100644
index ce1e4543f5..0000000000
--- a/strings/names/moth.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-Attacus
-Ascalapha
-Catocala
-Hyalophora
-Argema
-Opodiphthera
-Actias
-Antheraea
-Sphingidae
-Helicoverpa
-Spodoptera
-Maruca
-Thaumetopoea
-Mythimna
-Plutella
-Timandra
-Eugnorisma
-Eacles
-Epiphyas
-Bombyx
-Ochropleura
-Xanthorhoe
-Mythimna
-Chloroclystis
-Naenia
-Aphomia
-Eupithecia
-Callosamia
-Cryphia
-Acherontia
-Lymantria
-Cydia
-Ostrinia
-Xestia
-Plodia
-Axylia
-Naenia
-Cucullia
-Euplexia
-Diarsia
\ No newline at end of file
diff --git a/strings/names/moth_first.txt b/strings/names/moth_first.txt
new file mode 100644
index 0000000000..cfd8a8675f
--- /dev/null
+++ b/strings/names/moth_first.txt
@@ -0,0 +1,100 @@
+Acantharctia
+Acco
+Acherontia
+Actias
+Aemilia
+Aethria
+Antheraea
+Aphomia
+Argema
+Ascalapha
+Asota
+Athrypsiastis
+Attacus
+Autochloris
+Axylia
+Bombyx
+Callosamia
+Callhistia
+Capricornia
+Catocala
+Cheliosea
+Chloroclystis
+Cochylimorpha
+Cryphia
+Cryptophasa
+Cucullia
+Cydia
+Diarsia
+Diaphora
+Dolichohedya
+Dyspyralis
+Eacles
+Eclipsea
+Electresia
+Elysius
+Enarmonia
+Eriomastyx
+Epiphyas
+Eugnorisma
+Eupithecia
+Euplexia
+Eurosia
+Falcatula
+Fangarctia
+Fulcrifera
+Glyphidoptera
+Gracillina
+Gravitarmata
+Haemanota
+Halysidota
+Helicoverpa
+Heliomata
+Hyalophora
+Hypomartyria
+Icelita
+Isanthrene
+Isochorista
+Izatha
+Kodiosoma
+Lacida
+Leguminivora
+Leucoptera
+Lymantria
+Macrobathra
+Maruca
+Mecodina
+Megalonycta
+Metacrisia
+Mythimna
+Naenia
+Naenia
+Neuroxena
+Nodaria
+Nymphicula
+Obscurior
+Ochropleura
+Opodiphthera
+Ostrinia
+Pacificulla
+Philomusaea
+Phragmataecia
+Plodia
+Plutella
+Rachiplusia
+Sarobela
+Selenarctia
+Shiragasane
+Sphingidae
+Socioplana
+Spodoptera
+Syllomatia
+Thaumetopoea
+Timandra
+Toxoproctis
+Uranophora
+Vestura
+Vietteria
+Xanthorhoe
+Xestia
+Zomaria
diff --git a/strings/names/moth_last.txt b/strings/names/moth_last.txt
new file mode 100644
index 0000000000..46254e1ab6
--- /dev/null
+++ b/strings/names/moth_last.txt
@@ -0,0 +1,57 @@
+Accurata
+Adultera
+Albipuncta
+Albostriata
+Albovenosa
+Argentea
+Bicolorata
+Bifasciata
+Cameroni
+Chiangmai
+Combinata
+Convecta
+Cuneilinea
+Curvata
+Dentata
+Empyrea
+Eucrossa
+Ferrilinea
+Fraterna
+Goniosigma
+Hamifera
+Hirashimai
+Hypophaea
+Ignita
+Impura
+Insularis
+Infrargyrea
+Intermediata
+Intolerabilis
+Laevusta
+Languida
+Liebherri
+Lineatipes
+Lucida
+Maxima
+Mediana
+Modesta
+Monticola
+Naumanni
+Nepalina
+Obscura
+Osseogrisea
+Pastellina
+Phlebitis 
+Pyrausta
+Radiata
+Riparia
+Rufulosa
+Semicana
+Separata
+Siamensis
+Simplex
+Toumodi
+Undicilia
+Uruma
+Vittata
+Yuennana