diff --git a/code/datums/outfits/jobs/_defines.dm b/code/datums/outfits/jobs/_defines.dm
index 8e39427315..e4bdd05fbb 100644
--- a/code/datums/outfits/jobs/_defines.dm
+++ b/code/datums/outfits/jobs/_defines.dm
@@ -1 +1,2 @@
 #define OUTFIT_JOB_NAME(job_name) ("Job - " + job_name)
+#define OUTFIT_MILITARY(job_name) ("Military Uniform - " + job_name)
\ No newline at end of file
diff --git a/code/datums/outfits/jobs/medical.dm b/code/datums/outfits/jobs/medical.dm
index cbfd730261..2b3c2c2407 100644
--- a/code/datums/outfits/jobs/medical.dm
+++ b/code/datums/outfits/jobs/medical.dm
@@ -15,7 +15,7 @@
 	suit = /obj/item/clothing/suit/storage/toggle/labcoat/cmo
 	shoes = /obj/item/clothing/shoes/brown
 	l_hand = /obj/item/weapon/storage/firstaid/adv
-	r_pocket = /obj/item/device/flashlight/pen
+	r_pocket = /obj/item/device/healthanalyzer
 	id_type = /obj/item/weapon/card/id/medical/head
 	pda_type = /obj/item/device/pda/heads/cmo
 
@@ -24,7 +24,7 @@
 	uniform = /obj/item/clothing/under/rank/medical
 	suit = /obj/item/clothing/suit/storage/toggle/labcoat
 	l_hand = /obj/item/weapon/storage/firstaid/adv
-	r_pocket = /obj/item/device/flashlight/pen
+	r_pocket = /obj/item/device/healthanalyzer
 	id_type = /obj/item/weapon/card/id/medical/doctor
 
 /decl/hierarchy/outfit/job/medical/doctor/emergency_physician
diff --git a/code/datums/outfits/military/fleet.dm b/code/datums/outfits/military/fleet.dm
index 9960372505..cf5028978d 100644
--- a/code/datums/outfits/military/fleet.dm
+++ b/code/datums/outfits/military/fleet.dm
@@ -1,20 +1,20 @@
 /decl/hierarchy/outfit/military/fleet/pt
-	name = "Fleet Uniform - PT"
+	name = OUTFIT_MILITARY("Fleet PT")
 	uniform = /obj/item/clothing/under/pt/fleet
 	shoes = /obj/item/clothing/shoes/black
 
 /decl/hierarchy/outfit/military/fleet/utility
-	name = "Fleet Uniform - Utility"
+	name = OUTFIT_MILITARY("Fleet Utility")
 	uniform = /obj/item/clothing/under/utility/fleet
 	shoes = /obj/item/clothing/shoes/boots/jackboots
 
 /decl/hierarchy/outfit/military/fleet/service
-	name = "Fleet Uniform - Service"
+	name = OUTFIT_MILITARY("Fleet Service")
 	uniform = /obj/item/clothing/under/service/fleet
 	shoes = /obj/item/clothing/shoes/dress/white
 
 /decl/hierarchy/outfit/military/fleet/dress
-	name = "Fleet Uniform - Dress"
+	name = OUTFIT_MILITARY("Fleet Dress")
 	uniform = /obj/item/clothing/under/service/fleet
 	shoes = /obj/item/clothing/shoes/dress/white
 	suit = /obj/item/clothing/suit/storage/toggle/dress/fleet
diff --git a/code/datums/outfits/military/marines.dm b/code/datums/outfits/military/marines.dm
index 3fd5990653..d818dabcaa 100644
--- a/code/datums/outfits/military/marines.dm
+++ b/code/datums/outfits/military/marines.dm
@@ -1,21 +1,21 @@
 /decl/hierarchy/outfit/military/marine/pt
-	name = "Marine Uniform - PT"
+	name = OUTFIT_MILITARY("Marine PT")
 	uniform = /obj/item/clothing/under/pt/marine
 	shoes = /obj/item/clothing/shoes/black
 
 /decl/hierarchy/outfit/military/marine/utility
-	name = "Marine Uniform - Utility"
+	name = OUTFIT_MILITARY("Marine Utility")
 	uniform = /obj/item/clothing/under/utility/marine
 	shoes = /obj/item/clothing/shoes/boots/jungle
 
 /decl/hierarchy/outfit/military/marine/service
-	name = "Marine Uniform - Service"
+	name = OUTFIT_MILITARY("Marine Service")
 	uniform = /obj/item/clothing/under/service/marine
 	shoes = /obj/item/clothing/shoes/dress
 	suit = /obj/item/clothing/suit/storage/service/marine
 
 /decl/hierarchy/outfit/military/marine/dress
-	name = "Marine Uniform - Dress"
+	name = OUTFIT_MILITARY("Marine Dress")
 	uniform = /obj/item/clothing/under/mildress/marine
 	shoes = /obj/item/clothing/shoes/dress/white
 	suit = /obj/item/clothing/suit/dress/marine
diff --git a/code/datums/outfits/military/sifguard.dm b/code/datums/outfits/military/sifguard.dm
index f417b55fe2..d031a5149d 100644
--- a/code/datums/outfits/military/sifguard.dm
+++ b/code/datums/outfits/military/sifguard.dm
@@ -1,21 +1,21 @@
 /decl/hierarchy/outfit/military/sifguard/pt
-	name = "SifGuard Uniform - PT"
+	name = OUTFIT_MILITARY("SifGuard PT")
 	uniform = /obj/item/clothing/under/pt/expeditionary
 	shoes = /obj/item/clothing/shoes/black
 
 /decl/hierarchy/outfit/military/sifguard/utility
-	name = "SifGuard Uniform - Utility"
+	name = OUTFIT_MILITARY("SifGuard Utility")
 	uniform = /obj/item/clothing/under/utility/expeditionary
 	shoes = /obj/item/clothing/shoes/boots/jackboots
 
 /decl/hierarchy/outfit/military/sifguard/service
-	name = "SifGuard Uniform - Service"
+	name = OUTFIT_MILITARY("SifGuard Service")
 	uniform = /obj/item/clothing/under/utility/expeditionary
 	shoes = /obj/item/clothing/shoes/boots/jackboots
 	suit = /obj/item/clothing/suit/storage/service/expeditionary
 
 /decl/hierarchy/outfit/military/sifguard/dress
-	name = "SifGuard Uniform - Dress"
+	name = OUTFIT_MILITARY("SifGuard Dress")
 	uniform = /obj/item/clothing/under/mildress/expeditionary
 	shoes = /obj/item/clothing/shoes/dress
 	suit = /obj/item/clothing/suit/dress/expedition