diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm
index bf63b7ccab9..1a901f4a71e 100644
--- a/code/game/mecha/combat/marauder.dm
+++ b/code/game/mecha/combat/marauder.dm
@@ -21,7 +21,7 @@
 	add_req_access = 0
 	internal_damage_threshold = 25
 	force = 45
-	max_equip = 4
+	max_equip = 5
 
 
 /obj/mecha/combat/marauder/loaded/New()
@@ -30,6 +30,8 @@
 	ME.attach(src)
 	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack
 	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/xray(src)
+	ME.attach(src)
 	ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay(src)
 	ME.attach(src)
 	ME = new /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster(src)
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index ebe080d69aa..dbcbe71e167 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -883,7 +883,7 @@
 	category = list("Exosuit Equipment")
 
 /datum/design/mech_laser
-	name = "Exosuit Weapon (CH-PL \"Standard\" Laser)"
+	name = "Exosuit Weapon (CH-PL \"Old Faithful\" Laser)"
 	desc = "Allows for the construction of CH-PS Laser."
 	id = "mech_laser"
 	build_type = MECHFAB
@@ -981,20 +981,9 @@
 	construction_time = 100
 	category = list("Exosuit Equipment")
 
-/datum/design/mech_xray
-	name = "Exosuit Weapon (MKI X-Ray Laser)"
-	desc = "Allows for the construction of MKI X-Ray Laser."
-	id = "mech_tesla"
-	build_type = MECHFAB
-	req_tech = list("combat" = 5, "materials" = 3, "syndicate" = 2, "magnets" = 2)
-	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/xray
-	materials = list(MAT_GOLD = 5000, MAT_URANIUM = 10000, MAT_METAL = 4000)
-	construction_time = 100
-	category = list("Exosuit Equipment")
-
 /datum/design/mech_immolator
-	name = "Exosuit Weapon (MKI Immolator Laser)"
-	desc = "Allows for the construction of MKI Immolator Laser."
+	name = "Exosuit Weapon (ZFI Immolation Beam Gun)"
+	desc = "Allows for the construction of ZFI Immolation Beam Gun."
 	id = "mech_tesla"
 	build_type = MECHFAB
 	req_tech = list("combat" = 4, "materials" = 4, "plasmatech" = 2, "magnets" = 3)