diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm
index e47d57ffa03..763335f4687 100644
--- a/code/game/objects/items/weapons/melee/misc.dm
+++ b/code/game/objects/items/weapons/melee/misc.dm
@@ -21,9 +21,9 @@
 		return (OXYLOSS)
 
 
-/obj/item/weapon/melee/rapier
-	name = "captain's rapier"
-	desc = "An elegant weapon, for a more civilized age."
+/obj/item/weapon/melee/sabre
+	name = "officer's sabre"
+	desc = "An elegant weapon, its monomolecular edge is capable of cutting through flesh and bone with ease."
 	icon_state = "rapier"
 	item_state = "rapier"
 	flags = CONDUCT
@@ -38,7 +38,7 @@
 	hitsound = 'sound/weapons/rapierhit.ogg'
 	materials = list(MAT_METAL = 1000)
 
-/obj/item/weapon/melee/rapier/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type)
+/obj/item/weapon/melee/sabre/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type)
 	if(attack_type == PROJECTILE_ATTACK)
 		final_block_chance = 0 //Don't bring a sword to a gunfight
 	return ..()
@@ -238,4 +238,4 @@
 	T.CalculateAdjacentTurfs()
 
 /obj/item/weapon/melee/supermatter_sword/add_blood(list/blood_dna)
-	return 0
\ No newline at end of file
+	return 0
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 030772b4395..1e44ed026b5 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -415,18 +415,18 @@
 	icon_state = "fannypack_yellow"
 	item_state = "fannypack_yellow"
 
-/obj/item/weapon/storage/belt/rapier
-	name = "rapier sheath"
-	desc = "Can hold rapiers."
-	icon_state = "sheath"
-	item_state = "sheath"
+/obj/item/weapon/storage/belt/sabre
+	name = "sabre sheath"
+	desc = "An ornate sheath designed to hold an officer's blade."
+	icon_state = "sheath-rapier"
+	item_state = "sheath-rapier"
 	storage_slots = 1
 	max_w_class = 4
 	can_hold = list(
-		/obj/item/weapon/melee/rapier
+		/obj/item/weapon/melee/sabre
 		)
 
-/obj/item/weapon/storage/belt/rapier/update_icon()
+/obj/item/weapon/storage/belt/sabre/update_icon()
 	icon_state = "[initial(icon_state)]"
 	item_state = "[initial(item_state)]"
 	if(contents.len)
@@ -437,6 +437,6 @@
 		L.regenerate_icons()
 	..()
 
-/obj/item/weapon/storage/belt/rapier/New()
+/obj/item/weapon/storage/belt/sabre/New()
 	..()
-	new /obj/item/weapon/melee/rapier(src)
+	new /obj/item/weapon/melee/sabre(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index ff73411c6a5..eaaed69b978 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -26,7 +26,7 @@
 	new /obj/item/clothing/glasses/sunglasses/gar/supergar(src)
 	new /obj/item/clothing/gloves/color/captain(src)
 	new /obj/item/weapon/restraints/handcuffs/cable/zipties(src)
-	new /obj/item/weapon/storage/belt/rapier(src)
+	new /obj/item/weapon/storage/belt/sabre(src)
 	new /obj/item/weapon/gun/energy/gun(src)
 	new /obj/item/weapon/door_remote/captain(src)