diff --git a/code/modules/mob/living/silicon/robot/sprites/sprite_organized/gooborgs.dm b/code/modules/mob/living/silicon/robot/sprites/sprite_organized/gooborgs.dm
index 5d5e54c7cd5..75927c1120c 100644
--- a/code/modules/mob/living/silicon/robot/sprites/sprite_organized/gooborgs.dm
+++ b/code/modules/mob/living/silicon/robot/sprites/sprite_organized/gooborgs.dm
@@ -144,7 +144,7 @@
 	rest_sprite_options = list("Default", "Bellyup", "Sit")
 	belly_capacity_list = list("sleeper" = 2, "throat" = 2)
 
-/datum/robot_sprite/dogborg/tall/combat_gooborg
+/datum/robot_sprite/dogborg/tall/combat/gooborg
 	name = "Gooborg"
 	sprite_icon_state = "base"
 	//sprite_hud_icon_state = "malf"
@@ -159,9 +159,8 @@
 	rest_sprite_options = list("Default", "Bellyup", "Sit")
 	belly_capacity_list = list("sleeper" = 2, "throat" = 2)
 	sprite_flags = ROBOT_HAS_SHIELD_SPRITE | ROBOT_HAS_SPEED_SPRITE | ROBOT_HAS_DISABLER_SPRITE | ROBOT_HAS_TASER_SPRITE | ROBOT_HAS_LASER_SPRITE | ROBOT_HAS_MELEE_SPRITE //Baton
-	module_type = "Combat"
 
-/datum/robot_sprite/dogborg/tall/combat_gooborg/get_eyes_overlay(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/dogborg/tall/combat/gooborg/get_eyes_overlay(var/mob/living/silicon/robot/ourborg)
 	if(ourborg.has_active_type(/obj/item/borg/combat/mobility))
 		return
 	return ..()
@@ -182,7 +181,7 @@
 	belly_capacity_list = list("sleeper" = 2, "throat" = 2)
 
 //Exploration.
-/datum/robot_sprite/dogborg/tall/exploration/gooborg
+/datum/robot_sprite/dogborg/tall/explorer/gooborg
 	name = "Gooborg"
 	sprite_icon_state = "base"
 	//sprite_hud_icon_state = "explo"
@@ -197,7 +196,7 @@
 	rest_sprite_options = list("Default", "Bellyup", "Sit")
 	belly_capacity_list = list("sleeper" = 2, "throat" = 2)
 
-/datum/robot_sprite/dogborg/tall/ninja_gooborg
+/datum/robot_sprite/dogborg/tall/ninja/gooborg
 	name = "Gooborg"
 	sprite_icon_state = "base"
 	//sprite_hud_icon_state = "syndicat"
@@ -212,10 +211,9 @@
 	rest_sprite_options = list("Default", "Bellyup", "Sit")
 	belly_capacity_list = list("sleeper" = 2, "throat" = 2)
 	sprite_flags = ROBOT_HAS_SPEED_SPRITE | ROBOT_HAS_SHIELD_SPRITE | ROBOT_HAS_BLADE_SPRITE //esword
-	module_type = "Ninja"
 	sprite_hud_icon_state = "malf" //malf!!
 
-/datum/robot_sprite/dogborg/tall/ninja_gooborg/get_eyes_overlay(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/dogborg/tall/ninja/gooborg/get_eyes_overlay(var/mob/living/silicon/robot/ourborg)
 	if(ourborg.has_active_type(/obj/item/borg/combat/mobility))
 		return
 	else
diff --git a/code/modules/mob/living/silicon/robot/sprites/syndicate.dm b/code/modules/mob/living/silicon/robot/sprites/syndicate.dm
index 0254cb75c9a..07dfb2efb40 100644
--- a/code/modules/mob/living/silicon/robot/sprites/syndicate.dm
+++ b/code/modules/mob/living/silicon/robot/sprites/syndicate.dm
@@ -273,10 +273,7 @@
 */
 /datum/robot_sprite/dogborg/tall/ninja
 	module_type = "Ninja"
-	sprite_icon = 'icons/mob/robot/tallrobot/tallrobots.dmi'
 	sprite_hud_icon_state = "malf"
-	icon_x = 32
-	pixel_x = 0
 
 /datum/robot_sprite/dogborg/tall/ninja/dullahan
 	name = "dullahan"
@@ -288,31 +285,34 @@
 	belly_capacity_list = list("sleeper" = 3)
 	sprite_decals = list("decals")
 	rest_sprite_options = list("Default", "Sit")
-	pixel_x = -16
-	icon_x = 64
 
-/datum/robot_sprite/dogborg/tall/ninja/mekaninja
+/datum/robot_sprite/dogborg/tall/ninja/tall
+	sprite_icon = 'icons/mob/robot/tallrobot/tallrobots.dmi'
+	icon_x = 32
+	pixel_x = 0
+
+/datum/robot_sprite/dogborg/tall/ninja/tall/mekaninja
 	name = "Meka"
 	sprite_icon_state = "mekaninja"
 	has_eye_light_sprites = TRUE
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")
 
-/datum/robot_sprite/dogborg/tall/ninja/fmekaninja
+/datum/robot_sprite/dogborg/tall/ninja/tall/fmekaninja
 	name = "Niko"
 	sprite_icon_state = "fmekaninja"
 	has_eye_light_sprites = TRUE
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")
 
-/datum/robot_sprite/dogborg/tall/ninja/k4tninja
+/datum/robot_sprite/dogborg/tall/ninja/tall/k4tninja
 	name = "K4T"
 	sprite_icon_state = "k4tninja"
 	has_eye_light_sprites = TRUE
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")
 
-/datum/robot_sprite/dogborg/tall/ninja/mmekaninja
+/datum/robot_sprite/dogborg/tall/ninja/tall/mmekaninja
 	name = "Nika"
 	sprite_icon_state = "mmekaninja"
 	has_eye_light_sprites = TRUE
@@ -329,5 +329,3 @@
 	has_rest_eyes_sprites = TRUE
 	sprite_decals = list("breastplate", "breastplatehalo","swordhalo","tophalo")
 	rest_sprite_options = list("Default")
-	icon_x = 64
-	pixel_x = -16