diff --git a/README.md b/README.md
index 2c96c9a8..8de40a37 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,8 @@
 * Zone name displayed on bottom left of screen - `hud_zone_name`
 * Added proper game mode and map name to scoreboard
 * Added icons on scoreboard when player is downed, bled out, in Who's Who mode, or in afterlife
+* Weapon name is all capitalized on all maps
+* Weapon name is the same text size on all maps
 * Weapon name no longer fades out
 * Grenade icons no longer fade based on how many the player currently has
 * Moved keyboard and mouse dpad icons to their positions from Origins on all maps
diff --git a/ui_mp/t6/hud/weaponlabel.lua b/ui_mp/t6/hud/weaponlabel.lua
index 59e2c9c4..e06c7942 100644
--- a/ui_mp/t6/hud/weaponlabel.lua
+++ b/ui_mp/t6/hud/weaponlabel.lua
@@ -1,9 +1,11 @@
 CoD.WeaponLabel = {}
 CoD.WeaponLabel.TextHeight = 32
 CoD.WeaponLabel.FadeTime = 2000
+CoD.WeaponLabel.WeaponFontName = "Default"
 CoD.WeaponLabel.new = function (f1_arg0)
 	local Widget = LUI.UIElement.new(f1_arg0)
-	local f1_local1 = CoD.WeaponLabel.TextHeight
+	local f1_local1 = CoD.textSize[CoD.WeaponLabel.WeaponFontName]
+	local f1_local2 = CoD.fonts[CoD.WeaponLabel.WeaponFontName]
 	Widget.weaponLabel = LUI.UIText.new({
 		left = -1,
 		top = -f1_local1 / 2,
@@ -15,7 +17,7 @@ CoD.WeaponLabel.new = function (f1_arg0)
 		bottomAnchor = false,
 		alphaMultiplier = 1
 	})
-	Widget.weaponLabel:setFont(CoD.fonts.Big)
+	Widget.weaponLabel:setFont(f1_local2)
 	Widget.weaponLabel:registerAnimationState("fade_out", {
 		alphaMultiplier = 0
 	})
@@ -26,10 +28,6 @@ end
 
 CoD.WeaponLabel.UpdateWeapon = function (f2_arg0, f2_arg1)
 	f2_arg0.weaponLabel:animateToState("default")
-	if CoD.isZombie == true then
-		f2_arg0.weaponLabel:setText(Engine.Localize(f2_arg1.weaponDisplayName))
-	else
-		f2_arg0.weaponLabel:setText(UIExpression.ToUpper(nil, Engine.Localize(f2_arg1.weaponDisplayName)))
-	end
+	f2_arg0.weaponLabel:setText(UIExpression.ToUpper(nil, Engine.Localize(f2_arg1.weaponDisplayName)))
 	-- f2_arg0.weaponLabel:animateToState("fade_out", CoD.WeaponLabel.FadeTime)
 end
\ No newline at end of file