diff --git a/code/datums/autolathe/arms.dm b/code/datums/autolathe/arms.dm
index b40bf27e47..6bab4d6b2c 100644
--- a/code/datums/autolathe/arms.dm
+++ b/code/datums/autolathe/arms.dm
@@ -133,7 +133,7 @@
 	hidden = 1
 
 /datum/category_item/autolathe/arms/pistol_50
-	name = "pistol magazine (.50AE)"
+	name = "pistol magazine (.44)"
 	path =/obj/item/ammo_magazine/m50
 	hidden = 1
 
@@ -226,7 +226,7 @@
 	hidden = 1
 
 /datum/category_item/autolathe/arms/pistol_50
-	name = "pistol magazine (.50AE)"
+	name = "pistol magazine (.44)"
 	path =/obj/item/ammo_magazine/m50/empty
 	category = "Arms and Ammunition"
 	hidden = 1
@@ -340,7 +340,7 @@
 	hidden = 1
 
 /datum/category_item/autolathe/arms/pistol_clip_50
-	name = "ammo clip (.50AE)"
+	name = "ammo clip (.44)"
 	path =/obj/item/ammo_magazine/clip/c50
 	category = "Arms and Ammunition"
 	hidden = 1
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index e142f31ca0..dc54c76102 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -65,7 +65,7 @@
 /obj/item/ammo_magazine
 	name = "magazine"
 	desc = "A magazine for some kind of gun."
-	icon_state = "357"
+	icon_state = ".357"
 	icon = 'icons/obj/ammo.dmi'
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
@@ -78,7 +78,7 @@
 
 	var/list/stored_ammo = list()
 	var/mag_type = SPEEDLOADER //ammo_magazines can only be used with compatible guns. This is not a bitflag, the load_method var on guns is.
-	var/caliber = "357"
+	var/caliber = ".357"
 	var/max_ammo = 7
 
 	var/ammo_type = /obj/item/ammo_casing //ammo type that is initially loaded
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index 6202e03cde..1beb84e41d 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -30,7 +30,7 @@
 	name = "speedloader (.357)"
 	desc = "A speedloader for .357 revolvers."
 	icon_state = "38"
-	caliber = "357"
+	caliber = ".357"
 	ammo_type = /obj/item/ammo_casing/a357
 	matter = list(DEFAULT_WALL_MATERIAL = 1260)
 	max_ammo = 6
@@ -383,14 +383,14 @@
 
 ///////// .50 AE /////////
 
-/obj/item/ammo_magazine/m50
-	name = "magazine (.50 AE)"
-	icon_state = "50ae"
+/obj/item/ammo_magazine/m44
+	name = "magazine (.44)"
+	icon_state = ".44"
 	origin_tech = list(TECH_COMBAT = 2)
 	mag_type = MAGAZINE
-	caliber = ".50AE"
+	caliber = ".44"
 	matter = list(DEFAULT_WALL_MATERIAL = 1260)
-	ammo_type = /obj/item/ammo_casing/a50ae
+	ammo_type = /obj/item/ammo_casing/a44
 	max_ammo = 7
 	multiple_sprites = 1
 
@@ -401,8 +401,8 @@
 	name = "ammo clip (.50 AE)"
 	icon_state = "clip_pistol"
 	desc = "A stripper clip for reloading .50 Action Express rounds into magazines."
-	caliber = ".50AE"
-	ammo_type = /obj/item/ammo_casing/a50ae
+	caliber = ".44"
+	ammo_type = /obj/item/ammo_casing/a44
 	matter = list(DEFAULT_WALL_MATERIAL = 1620) // metal costs are very roughly based around one .50 casing = 180 metal
 	max_ammo = 9
 	multiple_sprites = 1
diff --git a/code/modules/projectiles/ammunition/rounds.dm b/code/modules/projectiles/ammunition/rounds.dm
index 3230e6ed62..eb36cae3b1 100644
--- a/code/modules/projectiles/ammunition/rounds.dm
+++ b/code/modules/projectiles/ammunition/rounds.dm
@@ -25,7 +25,7 @@
 
 /obj/item/ammo_casing/a357
 	desc = "A .357 bullet casing."
-	caliber = "357"
+	caliber = ".357"
 	projectile_type = /obj/item/projectile/bullet/pistol/strong
 
 /*
@@ -54,9 +54,9 @@
  * .50 Action Express
  */
 
-/obj/item/ammo_casing/a50ae
-	desc = "A .50AE bullet casing."
-	caliber = ".50AE"
+/obj/item/ammo_casing/a44
+	desc = "A .44 bullet casing."
+	caliber = ".44"
 	projectile_type = /obj/item/projectile/bullet/pistol/strong
 
 /*
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index 2d3d034bf9..b9c7b3f2db 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -11,7 +11,7 @@
 	matter = list(DEFAULT_WALL_MATERIAL = 1000)
 	recoil = 1
 
-	var/caliber = "357"		//determines which casings will fit
+	var/caliber = ".357"		//determines which casings will fit
 	var/handle_casings = EJECT_CASINGS	//determines how spent casings should be handled
 	var/load_method = SINGLE_CASING|SPEEDLOADER //1 = Single shells, 2 = box or quick loader, 3 = magazine
 	var/obj/item/ammo_casing/chambered = null
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index ba5f4f147d..00d5ee2109 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -120,7 +120,7 @@
 	icon_state = "deagle"
 	item_state = "deagle"
 	force = 14.0
-	caliber = ".50AE"
+	caliber = ".44"
 	load_method = MAGAZINE
 	fire_sound = 'sound/weapons/deagle.ogg'
 	magazine_type = /obj/item/ammo_magazine/m50
@@ -259,14 +259,14 @@
 		/obj/item/ammo_casing/a9mmf             = "9mm",
 		/obj/item/ammo_casing/a45f              = ".45",
 		/obj/item/ammo_casing/a10mm             = "10mm",
-		/obj/item/ammo_casing/a12g           = "12 gauge",
-		/obj/item/ammo_casing/a12g           = "12 gauge",
-		/obj/item/ammo_casing/a12g/pellet    = "12 gauge",
-		/obj/item/ammo_casing/a12g/pellet    = "12 gauge",
-		/obj/item/ammo_casing/a12g/pellet    = "12 gauge",
-		/obj/item/ammo_casing/a12g/beanbag   = "12 gauge",
-		/obj/item/ammo_casing/a12g/stunshell = "12 gauge",
-		/obj/item/ammo_casing/a12g/flash     = "12 gauge",
+		/obj/item/ammo_casing/a12g              = "12g",
+		/obj/item/ammo_casing/a12g              = "12g",
+		/obj/item/ammo_casing/a12g/pellet       = "12g",
+		/obj/item/ammo_casing/a12g/pellet       = "12g",
+		/obj/item/ammo_casing/a12g/pellet       = "12g",
+		/obj/item/ammo_casing/a12g/beanbag      = "12g",
+		/obj/item/ammo_casing/a12g/stunshell    = "12g",
+		/obj/item/ammo_casing/a12g/flash        = "12g",
 		/obj/item/ammo_casing/a762              = "7.62mm",
 		/obj/item/ammo_casing/a556              = "5.56mm"
 		)
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 3886450fcf..7d7a01464f 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -3,7 +3,7 @@
 	desc = "The Lumoco Arms HE Colt is a choice revolver for when you absolutely, positively need to put a hole in the other guy. Uses .357 rounds."
 	icon_state = "revolver"
 	item_state = "revolver"
-	caliber = "357"
+	caliber = ".357"
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
 	handle_casings = CYCLE_CASINGS
 	max_shells = 6
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index dcdb20e070..b105cb9e12 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ