diff --git a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
index 67eb3e648365..ed1febb808b2 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
@@ -3073,7 +3073,7 @@
 	pixel_x = -3
 	},
 /obj/item/ammo_box/magazine/illestren_a850r,
-/obj/item/storage/box/ammo/c9mm/ap,
+/obj/item/storage/box/ammo/c9mm_ap,
 /obj/item/ammo_box/magazine/illestren_a850r,
 /obj/item/ammo_box/magazine/co9mm{
 	start_empty = 1
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
index 538c5717a840..feef647c1142 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
@@ -13080,7 +13080,7 @@
 /obj/item/storage/box/ammo/c9mm,
 /obj/item/storage/box/ammo/c9mm,
 /obj/item/storage/box/ammo/c9mm,
-/obj/item/storage/box/ammo/c9mm/ap,
+/obj/item/storage/box/ammo/c9mm_ap,
 /obj/item/stock_parts/cell/gun{
 	pixel_x = -3;
 	pixel_y = -5
diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm
index 5ebf45ef1d85..9047120b6afa 100644
--- a/code/modules/cargo/packs/ammo.dm
+++ b/code/modules/cargo/packs/ammo.dm
@@ -30,7 +30,7 @@
 /datum/supply_pack/ammo/c9mmap_ammo_box
 	name = "9mm AP Ammo Box Crate"
 	desc = "Contains a 48-round 9mm box loaded with armor piercing ammo."
-	contains = list(/obj/item/storage/box/ammo/c9mm/ap)
+	contains = list(/obj/item/storage/box/ammo/c9mm_ap)
 	cost = 400
 
 /datum/supply_pack/ammo/c9mmhp_ammo_box
diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm
index 68ae4e2236ba..10c944b98d93 100644
--- a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm
+++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm
@@ -115,18 +115,18 @@
 		/obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/surplus = 48)
 	generate_items_inside(items_inside,src)
 
-/obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm_ap
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/ap
 	ammo_type = /obj/item/ammo_casing/c9mm/ap
 
-/obj/item/storage/box/ammo/c9mm/ap
+/obj/item/storage/box/ammo/c9mm_ap
 	name = "box of AP 9mm ammo"
 	desc = "A box of 9mm armor-piercing ammo, designed to penetrate through armor at the cost of total damage."
 	icon_state = "9mmbox-ap"
 
-/obj/item/storage/box/ammo/c9mm/ap/PopulateContents()
+/obj/item/storage/box/ammo/c9mm_ap/PopulateContents()
 	..()
 	var/static/items_inside = list(
-		/obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm_ap = 4)
+		/obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/ap = 4)
 	generate_items_inside(items_inside,src)
 
 /obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/hp
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index a07f9d96dd80..10d19097df56 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -388,7 +388,7 @@
 	id = "ap9mm"
 	build_type = PROTOLATHE
 	materials = list(/datum/material/iron = 15000, /datum/material/uranium = 1000)
-	build_path = /obj/item/storage/box/ammo/c9mm/ap
+	build_path = /obj/item/storage/box/ammo/c9mm_ap
 	category = list("Ammo")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY