diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index 0cef9125e83..4cd359fd5e9 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -219,8 +219,8 @@
 	new /obj/item/clothing/under/rank/trooper/gorka(src)
 	new /obj/item/clothing/under/rank/trooper/cadet(src)
 	new /obj/item/clothing/under/rank/trooper/cadet(src)
-	new /obj/item/clothing/under/rank/fatigues/green(src)
-	new /obj/item/clothing/under/rank/fatigues/green(src)
+	new /obj/item/clothing/under/rank/fatigues(src)
+	new /obj/item/clothing/under/rank/fatigues(src)
 	new /obj/item/clothing/under/rank/fatigues/grey(src)
 	new /obj/item/clothing/under/rank/fatigues/grey(src)
 	new /obj/item/clothing/under/rank/fatigues/navy(src)
diff --git a/code/modules/client/preference_setup/loadout/lists/factionblackshield.dm b/code/modules/client/preference_setup/loadout/lists/factionblackshield.dm
index 9b2401f90a3..60ff40b7110 100644
--- a/code/modules/client/preference_setup/loadout/lists/factionblackshield.dm
+++ b/code/modules/client/preference_setup/loadout/lists/factionblackshield.dm
@@ -97,7 +97,7 @@
 /datum/gear/factionblackshield/fatigueselection/New() //Like so.
 	..()
 	var/fatigues = list(
-		"Green Fatigues"				=	/obj/item/clothing/under/rank/fatigues/green,
+		"Green Fatigues"				=	/obj/item/clothing/under/rank/fatigues,
 		"Navy Fatigues"			=	/obj/item/clothing/under/rank/fatigues/navy,
 		"Grey Fatigues"			=	/obj/item/clothing/under/rank/fatigues/grey,
 		"Camo Fatigues"				=	/obj/item/clothing/under/rank/fatigues/camo,
diff --git a/code/modules/client/preference_setup/loadout/lists/headwear.dm b/code/modules/client/preference_setup/loadout/lists/headwear.dm
index 0cced593fb3..d8d6f0859b4 100644
--- a/code/modules/client/preference_setup/loadout/lists/headwear.dm
+++ b/code/modules/client/preference_setup/loadout/lists/headwear.dm
@@ -155,7 +155,7 @@
 
 /datum/gear/head/tanker_helmet/color_presets
 	display_name = "tanker/rugby helmet"
-	path = /obj/item/clothing/head/armor/helmet/tanker
+	path = /obj/item/clothing/head/helmet/tanker
 	cost = 1
 
 /datum/gear/head/ribbon
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 0dafc0435af..c7b1c2b92a7 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -49,7 +49,7 @@
 		rad = 0
 	)
 
-/obj/item/clothing/head/armor/helmet/tanker/verb/toggle_style()
+/obj/item/clothing/head/helmet/tanker/verb/toggle_style()
 	set name = "Adjust Style"
 	set category = "Object"
 	set src in usr
diff --git a/code/modules/clothing/under/jobs/militia.dm b/code/modules/clothing/under/jobs/militia.dm
index 6657ccb8c9b..8fb0d4b3cd6 100644
--- a/code/modules/clothing/under/jobs/militia.dm
+++ b/code/modules/clothing/under/jobs/militia.dm
@@ -21,13 +21,13 @@
  * Extra Fatigues
  */
 
-/obj/item/clothing/under/rank/fatigues/green
+/obj/item/clothing/under/rank/fatigues
 	name = "green utility uniform"
 	desc = "A green utility uniform, bearing the old marks of patches long since removed."
 	icon_state = "greenutility"
 	item_state = "greenutility"
 
-/obj/item/clothing/under/rank/fatigues/green/verb/toggle_style()
+/obj/item/clothing/under/rank/fatigues/verb/toggle_style()
 	set name = "Adjust Style"
 	set category = "Object"
 	set src in usr
@@ -63,7 +63,7 @@
 	icon_state = "greyutility"
 	item_state = "greyutility"
 
-/obj/item/clothing/under/rank/fatigues/grey/verb/toggle_style()
+/obj/item/clothing/under/rank/fatigues/grey/toggle_style()
 	set name = "Adjust Style"
 	set category = "Object"
 	set src in usr
@@ -98,7 +98,7 @@
 	icon_state = "navyutility"
 	item_state = "navyutility"
 
-/obj/item/clothing/under/rank/fatigues/navy/verb/toggle_style()
+/obj/item/clothing/under/rank/fatigues/navy/toggle_style()
 	set name = "Adjust Style"
 	set category = "Object"
 	set src in usr
@@ -134,7 +134,7 @@
 	icon_state = "tanutility"
 	item_state = "tanutility"
 
-/obj/item/clothing/under/rank/fatigues/tan/verb/toggle_style()
+/obj/item/clothing/under/rank/fatigues/tan/toggle_style()
 	set name = "Adjust Style"
 	set category = "Object"
 	set src in usr
@@ -169,7 +169,7 @@
 	icon_state = "camoutility"
 	item_state = "camoutility"
 
-/obj/item/clothing/under/rank/fatigues/camo/verb/toggle_style()
+/obj/item/clothing/under/rank/fatigues/camo/toggle_style()
 	set name = "Adjust Style"
 	set category = "Object"
 	set src in usr
@@ -223,8 +223,8 @@
 	icon_state = "bsjungle"
 	item_state = "bsjungle"
 
-/obj/item/clothing/under/rank/fatigues/kav/verb/toggle_style()
-	set name = "Adjust style"
+/obj/item/clothing/under/rank/fatigues/kav/toggle_style()
+	set name = "Adjust Style"
 	set category = "Object"
 	set src in usr
 
diff --git a/code/modules/trade/datums/trade_stations_presets/1-common/hellcat.dm b/code/modules/trade/datums/trade_stations_presets/1-common/hellcat.dm
index 360dc373c78..f8e188f4727 100644
--- a/code/modules/trade/datums/trade_stations_presets/1-common/hellcat.dm
+++ b/code/modules/trade/datums/trade_stations_presets/1-common/hellcat.dm
@@ -62,7 +62,7 @@
 			/obj/item/clothing/suit/armor/vest,
 			/obj/item/clothing/suit/armor/vest/ironhammer,
 			/obj/item/clothing/suit/storage/vest,
-			/obj/item/clothing/head/armor/helmet/tanker,
+			/obj/item/clothing/head/helmet/tanker,
 			/obj/item/clothing/suit/armor/bulletproof,
 			/obj/item/clothing/suit/armor/laserproof
 		)