diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 311376e1fd..83033257e3 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -174,7 +174,7 @@
 	w_class = 3.0
 	origin_tech = list(TECH_MATERIAL = 1)
 	var/breakouttime = 300	//Deciseconds = 30s = 0.5 minute
-	sprite_sheets = list("Seromi" = 'icons/mob/species/seromi/handcuffs.dmi')
+	sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/handcuffs.dmi')
 
 /obj/item/weapon/caution
 	desc = "Caution! Wet Floor!"
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 6b423f1309..732d3b27ac 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -11,7 +11,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	item_state = "electronic"
 	w_class = 2.0
 	slot_flags = SLOT_ID | SLOT_BELT
-	sprite_sheets = list("Seromi" = 'icons/mob/species/seromi/id.dmi')
+	sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/id.dmi')
 
 	//Main variables
 	var/pdachoice = 1
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index c725bcbba4..39b2b20b0c 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -95,7 +95,7 @@
 	item_state = "card-id"
 
 	sprite_sheets = list(
-		"Seromi" = 'icons/mob/species/seromi/id.dmi'
+		"Teshari" = 'icons/mob/species/seromi/id.dmi'
 		)
 
 	var/access = list()
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index 4ac0c15527..1868827b5b 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -17,7 +17,7 @@
 	var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes
 	var/cuff_sound = 'sound/weapons/handcuffs.ogg'
 	var/cuff_type = "handcuffs"
-	sprite_sheets = list("Seromi" = 'icons/mob/species/seromi/handcuffs.dmi')
+	sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/handcuffs.dmi')
 
 /obj/item/weapon/handcuffs/attack(var/mob/living/carbon/C, var/mob/living/user)
 
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 995b4491a9..db9db8a360 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -18,7 +18,7 @@
 		slot_r_hand_str = "backpack",
 		)
 	sprite_sheets = list(
-		"Seromi" = 'icons/mob/species/seromi/back.dmi'
+		"Teshari" = 'icons/mob/species/seromi/back.dmi'
 		)
 	w_class = 4
 	slot_flags = SLOT_BACK
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 58c85ab211..1cef59b466 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -6,7 +6,7 @@
 	item_state = "utility"
 	slot_flags = SLOT_BELT
 	attack_verb = list("whipped", "lashed", "disciplined")
-	sprite_sheets = list("Seromi" = 'icons/mob/species/seromi/belt.dmi')
+	sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/belt.dmi')
 
 	var/show_above_suit = 0
 
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 9c2cdbc293..dd3c4cff29 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -24,7 +24,7 @@ var/list/global/tank_gauge_cache = list()
 	throw_range = 4
 
 	sprite_sheets = list(
-		"Seromi" = 'icons/mob/species/seromi/back.dmi'
+		"Teshari" = 'icons/mob/species/seromi/back.dmi'
 		)
 
 	var/datum/gas_mixture/air_contents = null
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index d1878acfd9..6840c1fe81 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -101,7 +101,7 @@
 	w_class = 1.0
 	throwforce = 2
 	slot_flags = SLOT_EARS
-	sprite_sheets = list("Seromi" = 'icons/mob/species/seromi/ears.dmi')
+	sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/ears.dmi')
 
 /obj/item/clothing/ears/attack_hand(mob/user as mob)
 	if (!user) return
@@ -211,7 +211,7 @@ BLIND     // can't see anything
 	var/see_invisible = -1
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/eyes.dmi',
-		"Seromi" = 'icons/mob/species/seromi/eyes.dmi',
+		"Teshari" = 'icons/mob/species/seromi/eyes.dmi',
 		)
 
 /obj/item/clothing/glasses/update_clothing_icon()
@@ -236,7 +236,7 @@ BLIND     // can't see anything
 	species_restricted = list("exclude","Unathi","Tajara", "Vox")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/gloves.dmi',
-		"Seromi" = 'icons/mob/species/seromi/gloves.dmi',
+		"Teshari" = 'icons/mob/species/seromi/gloves.dmi',
 		)
 
 /obj/item/clothing/gloves/update_clothing_icon()
@@ -294,7 +294,7 @@ BLIND     // can't see anything
 
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/head.dmi',
-		"Seromi" = 'icons/mob/species/seromi/head.dmi'
+		"Teshari" = 'icons/mob/species/seromi/head.dmi'
 		)
 
 /obj/item/clothing/head/attack_self(mob/user)
@@ -393,7 +393,7 @@ BLIND     // can't see anything
 	body_parts_covered = FACE|EYES
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/masks.dmi',
-		"Seromi" = 'icons/mob/species/seromi/masks.dmi',
+		"Teshari" = 'icons/mob/species/seromi/masks.dmi',
 		)
 
 	var/voicechange = 0
@@ -426,10 +426,10 @@ BLIND     // can't see anything
 	slowdown = SHOES_SLOWDOWN
 	force = 2
 	var/overshoes = 0
-	species_restricted = list("exclude","Seromi", "Unathi","Tajara","Vox")
+	species_restricted = list("exclude","Teshari", "Unathi","Tajara","Vox")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/shoes.dmi',
-		"Seromi" = 'icons/mob/species/seromi/shoes.dmi',
+		"Teshari" = 'icons/mob/species/seromi/shoes.dmi',
 		)
 
 /obj/item/clothing/shoes/proc/draw_knife()
@@ -504,7 +504,7 @@ BLIND     // can't see anything
 
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/suit.dmi',
-		"Seromi" = 'icons/mob/species/seromi/suit.dmi'
+		"Teshari" = 'icons/mob/species/seromi/suit.dmi'
 		)
 
 /obj/item/clothing/suit/update_clothing_icon()
@@ -540,7 +540,7 @@ BLIND     // can't see anything
 	var/rolled_down = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/uniform.dmi',
-		"Seromi" = 'icons/mob/species/seromi/uniform.dmi'
+		"Teshari" = 'icons/mob/species/seromi/uniform.dmi'
 		)
 
 	//convenience var for defining the icon state for the overlay used when the clothing is worn.
diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm
index 5aa2d6d1ff..2d9d718587 100644
--- a/code/modules/clothing/head/collectable.dm
+++ b/code/modules/clothing/head/collectable.dm
@@ -11,7 +11,7 @@
 	icon_state = "petehat"
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/head.dmi',
-		"Seromi" = 'icons/mob/species/seromi/head.dmi'
+		"Teshari" = 'icons/mob/species/seromi/head.dmi'
 		)
 
 /obj/item/clothing/head/collectable/slime
diff --git a/code/modules/clothing/under/xenos/seromi.dm b/code/modules/clothing/under/xenos/seromi.dm
index 537534af6b..d0c565ac10 100644
--- a/code/modules/clothing/under/xenos/seromi.dm
+++ b/code/modules/clothing/under/xenos/seromi.dm
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/clothing/species/seromi/uniform.dmi'
 	icon_state = "seromi_grey"
 	worn_state = "seromi_grey"
-	species_restricted = list("Seromi")
+	species_restricted = list("Teshari")
 
 /obj/item/clothing/under/seromi/white
 	name = "small white smock"
@@ -24,7 +24,7 @@
 /obj/item/clothing/under/seromi/medical
 	name = "small Medical uniform"
 	icon_state = "seromi_medical"
-	worn_state = "Seromi_medical"
+	worn_state = "Teshari_medical"
 
 /obj/item/clothing/under/seromi/rainbow
 	name = "small rainbow smock"
diff --git a/code/modules/games/spaceball_cards.dm b/code/modules/games/spaceball_cards.dm
index a65cea598a..7e289ad270 100644
--- a/code/modules/games/spaceball_cards.dm
+++ b/code/modules/games/spaceball_cards.dm
@@ -20,4 +20,4 @@
 			P.card_icon = "spaceball_standard"
 		P.back_icon = "card_back_spaceball"
 
-		cards += P
\ No newline at end of file
+		cards += P
diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index 9ee2f83879..212f2219ad 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -10,7 +10,7 @@ var/list/holder_mob_icon_cache = list()
 
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/head.dmi',
-		"Seromi" = 'icons/mob/species/seromi/head.dmi'
+		"Teshari" = 'icons/mob/species/seromi/head.dmi'
 		)
 
 	origin_tech = null
diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm
index d28cd987c0..438b680f67 100644
--- a/code/modules/mob/language/station.dm
+++ b/code/modules/mob/language/station.dm
@@ -117,7 +117,7 @@
 
 /datum/language/seromi
 	name = "Schechi"
-	desc = "A trilling language spoken by the diminutive Seromi."
+	desc = "A trilling language spoken by the diminutive Teshari."
 	speech_verb = "chirps"
 	ask_verb = "chirrups"
 	exclaim_verb = "trills"
diff --git a/code/modules/mob/living/carbon/human/species/station/seromi.dm b/code/modules/mob/living/carbon/human/species/station/seromi.dm
index 92743d2ae5..27297d2f70 100644
--- a/code/modules/mob/living/carbon/human/species/station/seromi.dm
+++ b/code/modules/mob/living/carbon/human/species/station/seromi.dm
@@ -1,6 +1,6 @@
-/datum/species/seromi
-	name = "Seromi"
-	name_plural = "Seromii"
+/datum/species/teshari
+	name = "Teshari"
+	name_plural = "Tesharii"
 	blurb = "A race of feathered raptors who developed alongside the Skrell, inhabiting \
 	the polar tundral regions outside of Skrell territory. Extremely fragile, they developed \
 	hunting skills that emphasized taking out their prey without themselves getting hit. They \
@@ -83,7 +83,7 @@
 	var/hallucination_cap = 25
 
 // I'm... so... ronrery, so ronery...
-/datum/species/seromi/handle_environment_special(var/mob/living/carbon/human/H)
+/datum/species/teshari/handle_environment_special(var/mob/living/carbon/human/H)
 
 	// If they're dead or unconcious they're a bit beyond this kind of thing.
 	if(H.stat)
@@ -106,7 +106,7 @@
 	if(H.shock_stage >= shock_cap && H.hallucination < hallucination_cap)
 		H.hallucination += 2.5
 
-/datum/species/seromi/get_vision_flags(var/mob/living/carbon/human/H)
+/datum/species/teshari/get_vision_flags(var/mob/living/carbon/human/H)
 	if(!(H.sdisabilities & DEAF) && !H.ear_deaf)
 		return SEE_SELF|SEE_MOBS
 	else
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index bcc0edbac4..c1293dce90 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -61,20 +61,20 @@
 		name = "Short Hair 2"
 		icon_state = "hair_shorthair3"
 
-	Seromi
-		name = "Seromi Plumage"
+	Teshari
+		name = "Teshari Plumage"
 		icon_state = "seromi_default"
-		species_allowed = list("Seromi")
+		species_allowed = list("Teshari")
 
-	Seromi_ears
-		name = "Seromi Ears"
+	Teshari_ears
+		name = "Teshari Ears"
 		icon_state = "seromi_ears"
-		species_allowed = list("Seromi")
+		species_allowed = list("Teshari")
 
-	Seromi_excited
-		name = "Seromi Spiky"
+	Teshari_excited
+		name = "Teshari Spiky"
 		icon_state = "seromi_spiky"
-		species_allowed = list("Seromi")
+		species_allowed = list("Teshari")
 
 	cut
 		name = "Cut Hair"
diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm
index a919192d3e..281f854dac 100644
--- a/code/modules/organs/robolimbs.dm
+++ b/code/modules/organs/robolimbs.dm
@@ -15,7 +15,7 @@ var/datum/robolimb/basic_robolimb
 	var/desc = "A generic unbranded robotic prosthesis." // Seen when examining a limb.
 	var/icon = 'icons/mob/human_races/robotic.dmi'       // Icon base to draw from.
 	var/unavailable_at_chargen                           // If set, not available at chargen.
-	var/list/species_cannot_use = list("Seromi")
+	var/list/species_cannot_use = list("Teshari")
 
 /datum/robolimb/bishop
 	company = "Bishop"