diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm
index 241ebd1fdf6..74f63e9111c 100644
--- a/code/modules/client/preference/loadout/loadout_hat.dm
+++ b/code/modules/client/preference/loadout/loadout_hat.dm
@@ -97,18 +97,18 @@
 	display_name = "cowboy hat"
 	path = /obj/item/clothing/head/cowboyhat
 
-/datum/gear/hat/beret/purple
+/datum/gear/hat/pr_beret
 	display_name = "beret, purple"
 	path = /obj/item/clothing/head/beret/purple_normal
 
-/datum/gear/hat/beret/black
+/datum/gear/hat/bl_beret
 	display_name = "beret, black"
 	path = /obj/item/clothing/head/beret/black
 
-/datum/gear/hat/beret/blue
+/datum/gear/hat/blu_beret
 	display_name = "beret, blue"
 	path = /obj/item/clothing/head/beret/blue
 
-/datum/gear/hat/beret/red
+/datum/gear/hat/red_beret
 	display_name = "beret, red"
 	path = /obj/item/clothing/head/beret
diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm
index 2da1fddec94..e98d01e0b39 100644
--- a/code/modules/client/preference/loadout/loadout_suit.dm
+++ b/code/modules/client/preference/loadout/loadout_suit.dm
@@ -1,19 +1,19 @@
 /datum/gear/suit
 	subtype_path = /datum/gear/suit
 	slot = slot_wear_suit
+	cost = 2
 	sort_category = "External Wear"
 
 //WINTER COATS
 /datum/gear/suit/coat
 	subtype_path = /datum/gear/suit/coat
-	cost = 2
 
 /datum/gear/suit/coat/grey
 	display_name = "winter coat"
 	path = /obj/item/clothing/suit/hooded/wintercoat
 
 /datum/gear/suit/coat/job
-	subtype_path = /datum/gear/suit/coat
+	subtype_path = /datum/gear/suit/coat/job
 	subtype_cost_overlap = FALSE
 
 /datum/gear/suit/coat/job/sec
diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm
index 02cc369fe63..5bef51bdc1d 100644
--- a/code/modules/client/preference/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference/loadout/loadout_uniform.dm
@@ -2,6 +2,7 @@
 /datum/gear/uniform
 	subtype_path = /datum/gear/uniform
 	slot = slot_w_uniform
+	cost = 2
 	sort_category = "Uniforms and Casual Dress"
 
 /datum/gear/uniform/skirt
@@ -24,7 +25,6 @@
 	path = /obj/item/clothing/under/blackskirt
 
 /datum/gear/uniform/skirt/job
-	cost = 2
 	subtype_path = /datum/gear/uniform/skirt/job
 	subtype_cost_overlap = FALSE
 
@@ -100,7 +100,6 @@
 
 /datum/gear/uniform/sec
 	subtype_path = /datum/gear/uniform/sec
-	cost = 2
 
 /datum/gear/uniform/sec/formal
 	display_name = "security uniform, formal"
@@ -122,6 +121,9 @@ datum/gear/uniform/secorporate
 	path = /obj/item/clothing/under/rank/security2
 	allowed_roles = list("Head of Security", "Warden", "Security Officer", "Detective", "Security Pod Pilot")
 
+/datum/gear/uniform/shorts
+	subtype_path = /datum/gear/uniform/shorts
+
 /datum/gear/uniform/shorts/red
 	display_name = "shorts, red"
 	path = /obj/item/clothing/under/shorts/red
@@ -142,6 +144,9 @@ datum/gear/uniform/secorporate
 	display_name = "shorts, grey"
 	path = /obj/item/clothing/under/shorts/grey
 
+/datum/gear/uniform/pants
+	subtype_path = /datum/gear/uniform/pants
+
 /datum/gear/uniform/pants/jeans
 	display_name = "jeans, classic"
 	path = /obj/item/clothing/under/pants/classicjeans