diff --git a/code/modules/research/mechfab_designs.dm b/code/modules/research/mechfab_designs.dm
index 9b8bdb9a3d..252f335dc8 100644
--- a/code/modules/research/mechfab_designs.dm
+++ b/code/modules/research/mechfab_designs.dm
@@ -23,7 +23,7 @@
 	id = "ripley_torso"
 	build_path = /obj/item/mecha_parts/part/ripley_torso
 	time = 20
-	materials = list(MAT_STEEL = 30000, "glass" = 11250)
+	materials = list(MAT_STEEL = 30000, MAT_GLASS = 11250)
 
 /datum/design/item/mechfab/ripley/left_arm
 	name = "Ripley Left Arm"
@@ -75,7 +75,7 @@
 	id = "odysseus_head"
 	build_path = /obj/item/mecha_parts/part/odysseus_head
 	time = 10
-	materials = list(MAT_STEEL = 1500, "glass" = 7500)
+	materials = list(MAT_STEEL = 1500, MAT_GLASS = 7500)
 
 /datum/design/item/mechfab/odysseus/left_arm
 	name = "Odysseus Left Arm"
@@ -112,7 +112,7 @@
 	name = "Serenity Chassis"
 	id = "serenity_chassis"
 	build_path = /obj/item/mecha_parts/chassis/serenity
-	materials = list(MAT_STEEL = 18750, "phoron" = 4000)
+	materials = list(MAT_STEEL = 18750, MAT_PHORON = 4000)
 
 /datum/design/item/mechfab/gygax/chassis
 	name = "Gygax Chassis"
@@ -126,14 +126,14 @@
 	id = "gygax_torso"
 	build_path = /obj/item/mecha_parts/part/gygax_torso
 	time = 30
-	materials = list(MAT_STEEL = 37500, "glass" = 15000)
+	materials = list(MAT_STEEL = 37500, MAT_GLASS = 15000)
 
 /datum/design/item/mechfab/gygax/head
 	name = "Gygax Head"
 	id = "gygax_head"
 	build_path = /obj/item/mecha_parts/part/gygax_head
 	time = 20
-	materials = list(MAT_STEEL = 15000, "glass" = 7500)
+	materials = list(MAT_STEEL = 15000, MAT_GLASS = 7500)
 
 /datum/design/item/mechfab/gygax/left_arm
 	name = "Gygax Left Arm"
@@ -168,7 +168,7 @@
 	id = "gygax_armour"
 	build_path = /obj/item/mecha_parts/part/gygax_armour
 	time = 60
-	materials = list(MAT_STEEL = 37500, "diamond" = 7500)
+	materials = list(MAT_STEEL = 37500, MAT_DIAMOND = 7500)
 
 /datum/design/item/mechfab/durand
 	category = "Durand"
@@ -185,49 +185,49 @@
 	id = "durand_torso"
 	build_path = /obj/item/mecha_parts/part/durand_torso
 	time = 30
-	materials = list(MAT_STEEL = 41250, MAT_PLASTEEL = 15000, "silver" = 7500)
+	materials = list(MAT_STEEL = 41250, MAT_PLASTEEL = 15000, MAT_SILVER = 7500)
 
 /datum/design/item/mechfab/durand/head
 	name = "Durand Head"
 	id = "durand_head"
 	build_path = /obj/item/mecha_parts/part/durand_head
 	time = 20
-	materials = list(MAT_STEEL = 18750, "glass" = 7500, "silver" = 2250)
+	materials = list(MAT_STEEL = 18750, MAT_GLASS = 7500, MAT_SILVER = 2250)
 
 /datum/design/item/mechfab/durand/left_arm
 	name = "Durand Left Arm"
 	id = "durand_left_arm"
 	build_path = /obj/item/mecha_parts/part/durand_left_arm
 	time = 20
-	materials = list(MAT_STEEL = 26250, "silver" = 2250)
+	materials = list(MAT_STEEL = 26250, MAT_SILVER = 2250)
 
 /datum/design/item/mechfab/durand/right_arm
 	name = "Durand Right Arm"
 	id = "durand_right_arm"
 	build_path = /obj/item/mecha_parts/part/durand_right_arm
 	time = 20
-	materials = list(MAT_STEEL = 26250, "silver" = 2250)
+	materials = list(MAT_STEEL = 26250, MAT_SILVER = 2250)
 
 /datum/design/item/mechfab/durand/left_leg
 	name = "Durand Left Leg"
 	id = "durand_left_leg"
 	build_path = /obj/item/mecha_parts/part/durand_left_leg
 	time = 20
-	materials = list(MAT_STEEL = 30000, "silver" = 2250)
+	materials = list(MAT_STEEL = 30000, MAT_SILVER = 2250)
 
 /datum/design/item/mechfab/durand/right_leg
 	name = "Durand Right Leg"
 	id = "durand_right_leg"
 	build_path = /obj/item/mecha_parts/part/durand_right_leg
 	time = 20
-	materials = list(MAT_STEEL = 30000, "silver" = 2250)
+	materials = list(MAT_STEEL = 30000, MAT_SILVER = 2250)
 
 /datum/design/item/mechfab/durand/armour
 	name = "Durand Armour Plates"
 	id = "durand_armour"
 	build_path = /obj/item/mecha_parts/part/durand_armour
 	time = 60
-	materials = list(MAT_STEEL = 27500, MAT_PLASTEEL = 10000, "uranium" = 7500)
+	materials = list(MAT_STEEL = 27500, MAT_PLASTEEL = 10000, MAT_URANIUM = 7500)
 
 /datum/design/item/mechfab/janus
 	category = "Janus"
@@ -326,7 +326,7 @@
 	name = "Cable Layer"
 	id = "mech_cable_layer"
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/cable_layer
-	materials = list(MAT_STEEL = 7500, "plastic" = 1000)
+	materials = list(MAT_STEEL = 7500, MAT_PLASTIC = 1000)
 
 /datum/design/item/mecha/flaregun
 	name = "Flare Launcher"
@@ -338,20 +338,20 @@
 	name = "Sleeper"
 	id = "mech_sleeper"
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/sleeper
-	materials = list(MAT_STEEL = 3750, "glass" = 7500)
+	materials = list(MAT_STEEL = 3750, MAT_GLASS = 7500)
 
 /datum/design/item/mecha/syringe_gun
 	name = "Syringe Gun"
 	id = "mech_syringe_gun"
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun
 	time = 20
-	materials = list(MAT_STEEL = 2250, "glass" = 1500)
+	materials = list(MAT_STEEL = 2250, MAT_GLASS = 1500)
 
 /datum/design/item/mecha/passenger
 	name = "Passenger Compartment"
 	id = "mech_passenger"
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/passenger
-	materials = list(MAT_STEEL = 3750, "glass" = 3750)
+	materials = list(MAT_STEEL = 3750, MAT_GLASS = 3750)
 
 /datum/design/item/mecha/taser
 	name = "PBT \"Pacifier\" Mounted Taser"
@@ -369,7 +369,7 @@
 	id = "mech_shocker"
 	req_tech = list(TECH_COMBAT = 3, TECH_POWER = 6, TECH_MAGNET = 1)
 	build_path = /obj/item/mecha_parts/mecha_equipment/shocker
-	materials = list(MAT_STEEL = 3500, "gold" = 750, "glass" = 1000)
+	materials = list(MAT_STEEL = 3500, MAT_GOLD = 750, MAT_GLASS = 1000)
 
 /datum/design/item/mecha/lmg
 	name = "Ultra AC 2"
@@ -383,7 +383,7 @@
 
 /datum/design/item/mecha/weapon
 	req_tech = list(TECH_COMBAT = 3)
-	materials = list(MAT_STEEL = 8000, "glass" = 2000)
+	materials = list(MAT_STEEL = 8000, MAT_GLASS = 2000)
 
 // *** Weapon modules
 /datum/design/item/mecha/weapon/scattershot
@@ -391,21 +391,21 @@
 	id = "mech_scattershot"
 	req_tech = list(TECH_COMBAT = 4)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot
-	materials = list(MAT_STEEL = 8000, "glass" = 3000, "plastic" = 2000, "silver" = 2500)
+	materials = list(MAT_STEEL = 8000, MAT_GLASS = 3000, MAT_PLASTIC = 2000, MAT_SILVER = 2500)
 
 /datum/design/item/mecha/weapon/rigged_scattershot
 	name = "Jury-Rigged Shrapnel Cannon"
 	id = "mech_scattershot-r"
 	req_tech = list(TECH_COMBAT = 4)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot/rigged
-	materials = list(MAT_STEEL = 7000, "glass" = 2000, "plastic" = 2000, "silver" = 2000)
+	materials = list(MAT_STEEL = 7000, MAT_GLASS = 2000, MAT_PLASTIC = 2000, MAT_SILVER = 2000)
 
 /datum/design/item/mecha/weapon/laser
 	name = "CH-PS \"Immolator\" Laser"
 	id = "mech_laser"
 	req_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 3)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
-	materials = list(MAT_STEEL = 8000, "glass" = 3000, "plastic" = 2000)
+	materials = list(MAT_STEEL = 8000, MAT_GLASS = 3000, MAT_PLASTIC = 2000)
 
 /datum/design/item/mecha/weapon/laser_rigged
 	name = "Jury-Rigged Welder-Laser"
@@ -419,70 +419,70 @@
 	id = "mech_laser_heavy"
 	req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 4)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy
-	materials = list(MAT_STEEL = 10000, "glass" = 3000, "diamond" = 2000, "osmium" = 5000, "plastic" = 2000)
+	materials = list(MAT_STEEL = 10000, MAT_GLASS = 3000, MAT_DIAMOND = 2000, MAT_OSMIUM = 5000, MAT_PLASTIC = 2000)
 
 /datum/design/item/mecha/weapon/rigged_laser_heavy
 	name = "Jury-Rigged Emitter Cannon"
 	id = "mech_laser_heavy-r"
 	req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 4, TECH_PHORON = 3, TECH_ILLEGAL = 1)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy/rigged
-	materials = list(MAT_STEEL = 8000, "glass" = 4000, "diamond" = 1500, "osmium" = 4000, "plastic" = 2000)
+	materials = list(MAT_STEEL = 8000, MAT_GLASS = 4000, MAT_DIAMOND = 1500, MAT_OSMIUM = 4000, MAT_PLASTIC = 2000)
 
 /datum/design/item/mecha/weapon/laser_xray
 	name = "CH-XS \"Penetrator\" Laser"
 	id = "mech_laser_xray"
 	req_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 3, TECH_PHORON = 3, TECH_POWER = 4)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray
-	materials = list(MAT_STEEL = 9000, "glass" = 3000, "phoron" = 1000, "silver" = 1500, "gold" = 2500, "plastic" = 2000)
+	materials = list(MAT_STEEL = 9000, MAT_GLASS = 3000, MAT_PHORON = 1000, MAT_SILVER = 1500, MAT_GOLD = 2500, MAT_PLASTIC = 2000)
 
 /datum/design/item/mecha/weapon/rigged_laser_xray
 	name = "Jury-Rigged Xray Rifle"
 	id = "mech_laser_xray-r"
 	req_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 3, TECH_PHORON = 3, TECH_POWER = 4)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray/rigged
-	materials = list(MAT_STEEL = 8500, "glass" = 2500, "phoron" = 1000, "silver" = 1250, "gold" = 2000, "plastic" = 2000)
+	materials = list(MAT_STEEL = 8500, MAT_GLASS = 2500, MAT_PHORON = 1000, MAT_SILVER = 1250, MAT_GOLD = 2000, MAT_PLASTIC = 2000)
 
 /datum/design/item/mecha/weapon/phase
 	name = "NT-PE \"Scorpio\" Phase-Emitter"
 	id = "mech_phase"
 	req_tech = list(TECH_MATERIAL = 1, TECH_COMBAT = 2, TECH_MAGNET = 2)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/phase
-	materials = list(MAT_STEEL = 6000, "glass" = 3000, "plastic" = 3000)
+	materials = list(MAT_STEEL = 6000, MAT_GLASS = 3000, MAT_PLASTIC = 3000)
 
 /datum/design/item/mecha/weapon/ion
 	name = "MK-IV Ion Heavy Cannon"
 	id = "mech_ion"
 	req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 4)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion
-	materials = list(MAT_STEEL = 15000, "uranium" = 2000, "silver" = 2000, "osmium" = 4500, "plastic" = 2000)
+	materials = list(MAT_STEEL = 15000, MAT_URANIUM = 2000, MAT_SILVER = 2000, MAT_OSMIUM = 4500, MAT_PLASTIC = 2000)
 
 /datum/design/item/mecha/weapon/rigged_ion
 	name = "Jury-Rigged Ion Cannon"
 	id = "mech_ion-r"
 	req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 4)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion/rigged
-	materials = list(MAT_STEEL = 13000, "uranium" = 1000, "silver" = 1000, "osmium" = 3000, "plastic" = 2000)
+	materials = list(MAT_STEEL = 13000, MAT_URANIUM = 1000, MAT_SILVER = 1000, MAT_OSMIUM = 3000, MAT_PLASTIC = 2000)
 
 /datum/design/item/mecha/weapon/grenade_launcher
 	name = "SGL-6 Grenade Launcher"
 	id = "mech_grenade_launcher"
 	req_tech = list(TECH_COMBAT = 3)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade
-	materials = list(MAT_STEEL = 7000, "gold" = 2000, "plastic" = 3000)
+	materials = list(MAT_STEEL = 7000, MAT_GOLD = 2000, MAT_PLASTIC = 3000)
 
 /datum/design/item/mecha/weapon/rigged_grenade_launcher
 	name = "Jury-Rigged Pneumatic Flashlauncher"
 	id = "mech_grenade_launcher-rig"
 	req_tech = list(TECH_COMBAT = 3)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/rigged
-	materials = list(MAT_STEEL = 5000, "gold" = 2000, "plastic" = 2000)
+	materials = list(MAT_STEEL = 5000, MAT_GOLD = 2000, MAT_PLASTIC = 2000)
 
 /datum/design/item/mecha/weapon/clusterbang_launcher
 	name = "SOP-6 Grenade Launcher"
 	desc = "A weapon that violates the Geneva Convention at 6 rounds per minute."
 	id = "clusterbang_launcher"
 	req_tech = list(TECH_COMBAT= 5, TECH_MATERIAL = 5, TECH_ILLEGAL = 3)
-	materials = list(MAT_STEEL = 15000, "gold" = 4500, "uranium" = 4500)
+	materials = list(MAT_STEEL = 15000, MAT_GOLD = 4500, MAT_URANIUM = 4500)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/clusterbang/limited
 
 /datum/design/item/mecha/weapon/conc_grenade_launcher
@@ -490,21 +490,21 @@
 	id = "mech_grenade_launcher_conc"
 	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 4, TECH_ILLEGAL = 1)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/concussion
-	materials = list(MAT_STEEL = 9000, "gold" = 1000, "osmium" = 1000, "plastic" = 3000)
+	materials = list(MAT_STEEL = 9000, MAT_GOLD = 1000, MAT_OSMIUM = 1000, MAT_PLASTIC = 3000)
 
 /datum/design/item/mecha/weapon/frag_grenade_launcher
 	name = "HEP-MI 6 Grenade Launcher"
 	id = "mech_grenade_launcher_frag"
 	req_tech = list(TECH_COMBAT = 4, TECH_ENGINEERING = 2, TECH_MATERIAL = 3, TECH_ILLEGAL = 2)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/frag/mini
-	materials = list(MAT_STEEL = 10000, "gold" = 2500, "uranium" = 3000, "osmium" = 3000, "plastic" = 3000)
+	materials = list(MAT_STEEL = 10000, MAT_GOLD = 2500, MAT_URANIUM = 3000, MAT_OSMIUM = 3000, MAT_PLASTIC = 3000)
 
 /datum/design/item/mecha/weapon/flamer
 	name = "CR-3 Mark 8 Flamethrower"
 	desc = "A weapon that violates the CCWC at two hundred gallons per minute."
 	id = "mech_flamer_full"
 	req_tech = list(TECH_MATERIAL = 4, TECH_COMBAT = 6, TECH_PHORON = 4, TECH_ILLEGAL = 4)
-	materials = list(MAT_STEEL = 10000, "gold" = 2000, "uranium" = 3000, "phoron" = 8000)
+	materials = list(MAT_STEEL = 10000, MAT_GOLD = 2000, MAT_URANIUM = 3000, MAT_PHORON = 8000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer
 
 /datum/design/item/mecha/weapon/flamer_rigged
@@ -512,7 +512,7 @@
 	desc = "A weapon that accidentally violates the CCWC at one hundred gallons per minute."
 	id = "mech_flamer_rigged"
 	req_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 3, TECH_PHORON = 3, TECH_ILLEGAL = 2)
-	materials = list(MAT_STEEL = 8000, "gold" = 1500, "silver" = 1500, "uranium" = 2000, "phoron" = 6000)
+	materials = list(MAT_STEEL = 8000, MAT_GOLD = 1500, MAT_SILVER = 1500, MAT_URANIUM = 2000, MAT_PHORON = 6000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer/rigged
 
 /datum/design/item/mecha/weapon/flame_mg
@@ -520,7 +520,7 @@
 	desc = "A weapon that violates the CCWC at sixty rounds a minute."
 	id = "mech_lmg_flamer"
 	req_tech = list(TECH_MATERIAL = 4, TECH_COMBAT = 5, TECH_PHORON = 2, TECH_ILLEGAL = 1)
-	materials = list(MAT_STEEL = 8000, "gold" = 2000, "silver" = 1750, "uranium" = 1500, "phoron" = 4000)
+	materials = list(MAT_STEEL = 8000, MAT_GOLD = 2000, MAT_SILVER = 1750, MAT_URANIUM = 1500, MAT_PHORON = 4000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/incendiary
 
 // *** Nonweapon modules
@@ -550,7 +550,7 @@
 	desc = "An exosuit-mounted rapid construction device."
 	id = "mech_rcd"
 	time = 120
-	materials = list(MAT_STEEL = 20000, "plastic" = 10000, "phoron" = 18750, "silver" = 15000, "gold" = 15000)
+	materials = list(MAT_STEEL = 20000, MAT_PLASTIC = 10000, MAT_PHORON = 18750, MAT_SILVER = 15000, MAT_GOLD = 15000)
 	req_tech = list(TECH_MATERIAL = 4, TECH_BLUESPACE = 3, TECH_MAGNET = 4, TECH_POWER = 4, TECH_ENGINEERING = 4)
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/rcd
 
@@ -566,7 +566,7 @@
 	desc = "Automated repair droid, exosuits' best companion. BEEP BOOP"
 	id = "mech_repair_droid"
 	req_tech = list(TECH_MAGNET = 3, TECH_DATA = 3, TECH_ENGINEERING = 3)
-	materials = list(MAT_STEEL = 7500, "gold" = 750, "silver" = 1500, "glass" = 3750)
+	materials = list(MAT_STEEL = 7500, MAT_GOLD = 750, MAT_SILVER = 1500, MAT_GLASS = 3750)
 	build_path = /obj/item/mecha_parts/mecha_equipment/repair_droid
 
 /* These are way too OP to be buildable
@@ -575,7 +575,7 @@
 	desc = "Linear shield projector. Deploys a large, familiar, and rectangular shield in one direction at a time."
 	id = "mech_shield_droid"
 	req_tech = list(TECH_PHORON = 3, TECH_MAGNET = 6, TECH_ILLEGAL = 4)
-	materials = list(MAT_STEEL = 8000, "gold" = 2000, "silver" = 3000, "phoron" = 5000, "glass" = 3750)
+	materials = list(MAT_STEEL = 8000, MAT_GOLD = 2000, MAT_SILVER = 3000, MAT_PHORON = 5000, MAT_GLASS = 3750)
 	build_path = /obj/item/mecha_parts/mecha_equipment/combat_shield
 
 /datum/design/item/mecha/omni_shield
@@ -583,7 +583,7 @@
 	desc = "Integral shield projector. Can only protect the exosuit, but has no weak angles."
 	id = "mech_shield_omni"
 	req_tech = list(TECH_PHORON = 3, TECH_MAGNET = 6, TECH_ILLEGAL = 4)
-	materials = list(MAT_STEEL = 8000, "gold" = 2000, "silver" = 3000, "phoron" = 5000, "glass" = 3750)
+	materials = list(MAT_STEEL = 8000, MAT_GOLD = 2000, MAT_SILVER = 3000, MAT_PHORON = 5000, MAT_GLASS = 3750)
 	build_path = /obj/item/mecha_parts/mecha_equipment/omni_shield
 */
 
@@ -617,20 +617,20 @@
 	id = "mech_jetpack"
 	req_tech = list(TECH_ENGINEERING = 3, TECH_MAGNET = 4) //One less magnet than the actual got-damn teleporter.
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/jetpack
-	materials = list(MAT_STEEL = 7500, "silver" = 300, "glass" = 600)
+	materials = list(MAT_STEEL = 7500, MAT_SILVER = 300, MAT_GLASS = 600)
 
 /datum/design/item/mecha/phoron_generator
 	desc = "Phoron Reactor"
 	id = "mech_phoron_generator"
 	req_tech = list(TECH_PHORON = 2, TECH_POWER= 2, TECH_ENGINEERING = 2)
 	build_path = /obj/item/mecha_parts/mecha_equipment/generator
-	materials = list(MAT_STEEL = 7500, "silver" = 375, "glass" = 750)
+	materials = list(MAT_STEEL = 7500, MAT_SILVER = 375, MAT_GLASS = 750)
 
 /datum/design/item/mecha/energy_relay
 	name = "Energy Relay"
 	id = "mech_energy_relay"
 	req_tech = list(TECH_MAGNET = 4, TECH_POWER = 3)
-	materials = list(MAT_STEEL = 7500, "gold" = 1500, "silver" = 2250, "glass" = 1500)
+	materials = list(MAT_STEEL = 7500, MAT_GOLD = 1500, MAT_SILVER = 2250, MAT_GLASS = 1500)
 	build_path = /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay
 
 /datum/design/item/mecha/ccw_armor
@@ -638,7 +638,7 @@
 	desc = "Exosuit close-combat armor booster."
 	id = "mech_ccw_armor"
 	req_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 4)
-	materials = list(MAT_STEEL = 11250, "silver" = 3750)
+	materials = list(MAT_STEEL = 11250, MAT_SILVER = 3750)
 	build_path = /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster
 
 /datum/design/item/mecha/proj_armor
@@ -646,7 +646,7 @@
 	desc = "Exosuit projectile armor booster."
 	id = "mech_proj_armor"
 	req_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 5, TECH_ENGINEERING = 3)
-	materials = list(MAT_STEEL = 15000, "gold" = 3750)
+	materials = list(MAT_STEEL = 15000, MAT_GOLD = 3750)
 	build_path = /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster
 
 /datum/design/item/mecha/diamond_drill
@@ -654,7 +654,7 @@
 	desc = "A diamond version of the exosuit drill. It's harder, better, faster, stronger."
 	id = "mech_diamond_drill"
 	req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3)
-	materials = list(MAT_STEEL = 7500, "diamond" = 4875)
+	materials = list(MAT_STEEL = 7500, MAT_DIAMOND = 4875)
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill
 
 /datum/design/item/mecha/ground_drill
@@ -662,7 +662,7 @@
 	desc = "A heavy duty bore. Bigger, better, stronger than the core sampler, but not quite as good as a large drill."
 	id = "mech_ground_drill"
 	req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 2, TECH_PHORON = 1)
-	materials = list(MAT_STEEL = 7000, "silver" = 3000, "phoron" = 2000)
+	materials = list(MAT_STEEL = 7000, MAT_SILVER = 3000, MAT_PHORON = 2000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill/bore
 
 /datum/design/item/mecha/orescanner
@@ -670,7 +670,7 @@
 	desc = "A hefty device used to scan for subterranean veins of ore."
 	id = "mech_ore_scanner"
 	req_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 2, TECH_POWER = 2)
-	materials = list(MAT_STEEL = 4000, "glass" = 1000)
+	materials = list(MAT_STEEL = 4000, MAT_GLASS = 1000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/orescanner
 
 /datum/design/item/mecha/advorescanner
@@ -678,7 +678,7 @@
 	desc = "A hefty device used to scan for the exact volumes of subterranean veins of ore."
 	id = "mech_ore_scanner_adv"
 	req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 4, TECH_POWER = 4, TECH_BLUESPACE = 2)
-	materials = list(MAT_STEEL = 5000, "osmium" = 3000, "silver" = 1000)
+	materials = list(MAT_STEEL = 5000, MAT_OSMIUM = 3000, MAT_SILVER = 1000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/orescanner/advanced
 
 /datum/design/item/mecha/runningboard
@@ -694,7 +694,7 @@
 	desc = "A large, hydraulic wrench."
 	id = "mech_wrench"
 	req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2, TECH_POWER = 2)
-	materials = list(MAT_STEEL = 5000, "plastic" = 2000, "glass" = 1250)
+	materials = list(MAT_STEEL = 5000, MAT_PLASTIC = 2000, MAT_GLASS = 1250)
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/powertool
 
 /datum/design/item/mecha/powercrowbar
@@ -702,7 +702,7 @@
 	desc = "A large, hydraulic prybar."
 	id = "mech_crowbar"
 	req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2, TECH_POWER = 2)
-	materials = list(MAT_STEEL = 4000, "osmium" = 3000, "glass" = 1000)
+	materials = list(MAT_STEEL = 4000, MAT_OSMIUM = 3000, MAT_GLASS = 1000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/powertool/prybar
 
 /datum/design/item/mecha/powercutters
@@ -710,7 +710,7 @@
 	desc = "A large, hydraulic cablecutter."
 	id = "mech_wirecutter"
 	req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2, TECH_POWER = 2)
-	materials = list(MAT_STEEL = 4000, "osmium" = 3000, "glass" = 1000)
+	materials = list(MAT_STEEL = 4000, MAT_OSMIUM = 3000, MAT_GLASS = 1000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/powertool/cutter
 
 /datum/design/item/mecha/powerscrewdriver
@@ -718,7 +718,7 @@
 	desc = "A large, hydraulic screwdriver."
 	id = "mech_screwdriver"
 	req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2, TECH_POWER = 2)
-	materials = list(MAT_STEEL = 4000, "osmium" = 3000, "glass" = 1000)
+	materials = list(MAT_STEEL = 4000, MAT_OSMIUM = 3000, MAT_GLASS = 1000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/powertool/screwdriver
 
 /datum/design/item/mecha/powerwelder
@@ -726,7 +726,7 @@
 	desc = "A large welding laser."
 	id = "mech_welder"
 	req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2, TECH_POWER = 2)
-	materials = list(MAT_STEEL = 4000, MAT_PHORON = 3000, "glass" = 1000)
+	materials = list(MAT_STEEL = 4000, MAT_PHORON = 3000, MAT_GLASS = 1000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/powertool/welding
 
 /datum/design/item/mecha/inflatables
@@ -734,7 +734,7 @@
 	desc = "A large pneumatic inflatable deployer."
 	id = "mech_inflatables"
 	req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2, TECH_POWER = 2)
-	materials = list(MAT_STEEL = 2000, MAT_PLASTIC = 4000, "glass" = 1000)
+	materials = list(MAT_STEEL = 2000, MAT_PLASTIC = 4000, MAT_GLASS = 1000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/powertool/inflatables
 
 /datum/design/item/mecha/hardpoint_clamp
@@ -750,7 +750,7 @@
 	desc = "Exosuit-held nuclear reactor. Converts uranium and everyone's health to energy."
 	id = "mech_generator_nuclear"
 	req_tech = list(TECH_POWER= 3, TECH_ENGINEERING = 3, TECH_MATERIAL = 3)
-	materials = list(MAT_STEEL = 7500, "silver" = 375, "glass" = 750)
+	materials = list(MAT_STEEL = 7500, MAT_SILVER = 375, MAT_GLASS = 750)
 	build_path = /obj/item/mecha_parts/mecha_equipment/generator/nuclear
 
 /datum/design/item/mecha/speedboost_ripley
@@ -758,7 +758,7 @@
 	desc = "System enhancements and overdrives to make a mech's legs move faster."
 	id = "mech_speedboost_ripley"
 	req_tech = list( TECH_POWER = 5, TECH_MATERIAL = 4, TECH_ENGINEERING = 4)
-	materials = list(MAT_STEEL = 10000, "silver" = 1000, "gold" = 1000)
+	materials = list(MAT_STEEL = 10000, MAT_SILVER = 1000, MAT_GOLD = 1000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/speedboost
 
 /datum/design/item/synthetic_flash
@@ -766,7 +766,7 @@
 	id = "sflash"
 	req_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 2)
 	build_type = MECHFAB
-	materials = list(MAT_STEEL = 562, "glass" = 562)
+	materials = list(MAT_STEEL = 562, MAT_GLASS = 562)
 	build_path = /obj/item/device/flash/synthetic
 	category = "Misc"
 
@@ -784,7 +784,7 @@
 	desc = "A space-bike's un-assembled frame."
 	id = "vehicle_chassis_spacebike"
 	req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 6, TECH_BLUESPACE = 3, TECH_PHORON = 3)
-	materials = list(MAT_STEEL = 12000, "silver" = 3000, "phoron" = 3000, "osmium" = 1000)
+	materials = list(MAT_STEEL = 12000, MAT_SILVER = 3000, MAT_PHORON = 3000, MAT_OSMIUM = 1000)
 	build_path = /obj/item/weapon/vehicle_assembly/spacebike
 
 /datum/design/item/mechfab/vehicle/quadbike_chassis
@@ -792,7 +792,7 @@
 	desc = "A space-bike's un-assembled frame."
 	id = "vehicle_chassis_quadbike"
 	req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 6, TECH_MAGNET = 3, TECH_POWER = 2)
-	materials = list(MAT_STEEL = 15000, "silver" = 3000, "plastic" = 3000, "osmium" = 1000)
+	materials = list(MAT_STEEL = 15000, MAT_SILVER = 3000, MAT_PLASTIC = 3000, MAT_OSMIUM = 1000)
 	build_path = /obj/item/weapon/vehicle_assembly/quadbike
 
 /*
@@ -1047,7 +1047,7 @@
 	build_path = /obj/item/device/uav
 	time = 20
 	req_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 5, TECH_PHORON = 3, TECH_MAGNET = 4, TECH_POWER = 6)
-	materials = list(MAT_STEEL = 10000, "glass" = 6000, "silver" = 4000)
+	materials = list(MAT_STEEL = 10000, MAT_GLASS = 6000, MAT_SILVER = 4000)
 
 // Exosuit Internals
 
@@ -1108,7 +1108,7 @@
 	name = "Armor Plate (Military)"
 	id = "exo_int_armor_durand"
 	req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4, TECH_COMBAT = 2)
-	materials = list(MAT_STEEL = 40000, MAT_PLASTEEL = 9525, "uranium" = 8000)
+	materials = list(MAT_STEEL = 40000, MAT_PLASTEEL = 9525, MAT_URANIUM = 8000)
 	build_path = /obj/item/mecha_parts/component/armor/military
 
 /datum/design/item/mechfab/exointernal/marauder_armour
diff --git a/code/modules/research/prosfab_designs.dm b/code/modules/research/prosfab_designs.dm
index beebd6d67b..60f2f09055 100644
--- a/code/modules/research/prosfab_designs.dm
+++ b/code/modules/research/prosfab_designs.dm
@@ -92,7 +92,7 @@
 //////////////////// Prosthetics ////////////////////
 /datum/design/item/prosfab/pros/torso
 	time = 35
-	materials = list(MAT_STEEL = 30000, "glass" = 7500)
+	materials = list(MAT_STEEL = 30000, MAT_GLASS = 7500)
 //	req_tech = list(TECH_ENGINEERING = 2, TECH_MATERIAL = 3, TECH_DATA = 3)	//Saving the values just in case
 	var/gender = MALE
 
@@ -115,7 +115,7 @@
 	id = "pros_head"
 	build_path = /obj/item/organ/external/head
 	time = 30
-	materials = list(MAT_STEEL = 18750, "glass" = 3750)
+	materials = list(MAT_STEEL = 18750, MAT_GLASS = 3750)
 //	req_tech = list(TECH_ENGINEERING = 2, TECH_MATERIAL = 3, TECH_DATA = 3)	//Saving the values just in case
 
 /datum/design/item/prosfab/pros/l_arm
@@ -182,7 +182,7 @@
 	id = "pros_cell"
 	build_path = /obj/item/organ/internal/cell
 	time = 15
-	materials = list(MAT_STEEL = 7500, "glass" = 3000)
+	materials = list(MAT_STEEL = 7500, MAT_GLASS = 3000)
 //	req_tech = list(TECH_ENGINEERING = 2, TECH_MATERIAL = 2)
 
 /datum/design/item/prosfab/pros/internal/eyes
@@ -190,7 +190,7 @@
 	id = "pros_eyes"
 	build_path = /obj/item/organ/internal/eyes/robot
 	time = 15
-	materials = list(MAT_STEEL = 5625, "glass" = 5625)
+	materials = list(MAT_STEEL = 5625, MAT_GLASS = 5625)
 //	req_tech = list(TECH_ENGINEERING = 2, TECH_MATERIAL = 2)
 
 /datum/design/item/prosfab/pros/internal/hydraulic
@@ -226,7 +226,7 @@
 	id = "pros_heart"
 	build_path = /obj/item/organ/internal/heart
 	time = 15
-	materials = list(MAT_STEEL = 5625, "glass" = 1000)
+	materials = list(MAT_STEEL = 5625, MAT_GLASS = 1000)
 //	req_tech = list(TECH_ENGINEERING = 2, TECH_MATERIAL = 2)
 
 /datum/design/item/prosfab/pros/internal/lungs
@@ -234,7 +234,7 @@
 	id = "pros_lung"
 	build_path = /obj/item/organ/internal/lungs
 	time = 15
-	materials = list(MAT_STEEL = 5625, "glass" = 1000)
+	materials = list(MAT_STEEL = 5625, MAT_GLASS = 1000)
 //	req_tech = list(TECH_ENGINEERING = 2, TECH_MATERIAL = 2)
 
 /datum/design/item/prosfab/pros/internal/liver
@@ -242,7 +242,7 @@
 	id = "pros_liver"
 	build_path = /obj/item/organ/internal/liver
 	time = 15
-	materials = list(MAT_STEEL = 5625, "glass" = 1000)
+	materials = list(MAT_STEEL = 5625, MAT_GLASS = 1000)
 //	req_tech = list(TECH_ENGINEERING = 2, TECH_MATERIAL = 2)
 
 /datum/design/item/prosfab/pros/internal/kidneys
@@ -250,7 +250,7 @@
 	id = "pros_kidney"
 	build_path = /obj/item/organ/internal/kidneys
 	time = 15
-	materials = list(MAT_STEEL = 5625, "glass" = 1000)
+	materials = list(MAT_STEEL = 5625, MAT_GLASS = 1000)
 //	req_tech = list(TECH_ENGINEERING = 2, TECH_MATERIAL = 2)
 
 /datum/design/item/prosfab/pros/internal/spleen
@@ -394,21 +394,21 @@
 	name = "Emergency Restart Module"
 	desc = "Used to force a restart of a disabled-but-repaired robot, bringing it back online."
 	id = "borg_restart_module"
-	materials = list(MAT_STEEL = 45000, "glass" = 3750)
+	materials = list(MAT_STEEL = 45000, MAT_GLASS = 3750)
 	build_path = /obj/item/borg/upgrade/restart
 
 /datum/design/item/prosfab/robot_upgrade/vtec
 	name = "VTEC Module"
 	desc = "Used to kick in a robot's VTEC systems, increasing their speed."
 	id = "borg_vtec_module"
-	materials = list(MAT_STEEL = 60000, "glass" = 4500, "gold" = 3750)
+	materials = list(MAT_STEEL = 60000, MAT_GLASS = 4500, MAT_GOLD = 3750)
 	build_path = /obj/item/borg/upgrade/vtec
 
 /datum/design/item/prosfab/robot_upgrade/tasercooler
 	name = "Rapid Taser Cooling Module"
 	desc = "Used to cool a mounted taser, increasing the potential current in it and thus its recharge rate."
 	id = "borg_taser_module"
-	materials = list(MAT_STEEL = 60000, "glass" = 4500, "gold" = 1500, "diamond" = 375)
+	materials = list(MAT_STEEL = 60000, MAT_GLASS = 4500, MAT_GOLD = 1500, MAT_DIAMOND = 375)
 	build_path = /obj/item/borg/upgrade/tasercooler
 
 /datum/design/item/prosfab/robot_upgrade/jetpack
@@ -422,7 +422,7 @@
 	name = "Advanced Health Analyzer Module"
 	desc = "An advanced health analyzer suitable for diagnosing more serious injuries."
 	id = "borg_advhealth_module"
-	materials = list(MAT_STEEL = 10000, "glass" = 6500, "diamond" = 350)
+	materials = list(MAT_STEEL = 10000, MAT_GLASS = 6500, MAT_DIAMOND = 350)
 	build_path = /obj/item/borg/upgrade/advhealth
 
 /datum/design/item/prosfab/robot_upgrade/syndicate
@@ -430,7 +430,7 @@
 	desc = "Allows for the construction of lethal upgrades for cyborgs."
 	id = "borg_syndicate_module"
 	req_tech = list(TECH_COMBAT = 4, TECH_ILLEGAL = 3)
-	materials = list(MAT_STEEL = 7500, "glass" = 11250, "diamond" = 7500)
+	materials = list(MAT_STEEL = 7500, MAT_GLASS = 11250, MAT_DIAMOND = 7500)
 	build_path = /obj/item/borg/upgrade/syndicate
 
 /datum/design/item/prosfab/robot_upgrade/language
@@ -438,7 +438,7 @@
 	desc = "Used to let cyborgs other than clerical or service speak a variety of languages."
 	id = "borg_language_module"
 	req_tech = list(TECH_DATA = 6, TECH_MATERIAL = 6)
-	materials = list(MAT_STEEL = 25000, "glass" = 3000, "gold" = 350)
+	materials = list(MAT_STEEL = 25000, MAT_GLASS = 3000, MAT_GOLD = 350)
 	build_path = /obj/item/borg/upgrade/language
 
 // Synthmorph Bags.
@@ -447,42 +447,42 @@
 	name = "Synthmorph Storage Bag"
 	desc = "Used to store or slowly defragment an FBP."
 	id = "misc_synth_bag"
-	materials = list(MAT_STEEL = 250, "glass" = 250, "plastic" = 2000)
+	materials = list(MAT_STEEL = 250, MAT_GLASS = 250, MAT_PLASTIC = 2000)
 	build_path = /obj/item/bodybag/cryobag/robobag
 
 /datum/design/item/prosfab/badge_nt
 	name = "NanoTrasen Tag"
 	desc = "Used to identify an empty NanoTrasen FBP."
 	id = "misc_synth_bag_tag_nt"
-	materials = list(MAT_STEEL = 1000, "glass" = 500, "plastic" = 1000)
+	materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000)
 	build_path = /obj/item/clothing/accessory/badge/corporate_tag
 
 /datum/design/item/prosfab/badge_morph
 	name = "Morpheus Tag"
 	desc = "Used to identify an empty Morpheus FBP."
 	id = "misc_synth_bag_tag_morph"
-	materials = list(MAT_STEEL = 1000, "glass" = 500, "plastic" = 1000)
+	materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000)
 	build_path = /obj/item/clothing/accessory/badge/corporate_tag/morpheus
 
 /datum/design/item/prosfab/badge_wardtaka
 	name = "Ward-Takahashi Tag"
 	desc = "Used to identify an empty Ward-Takahashi FBP."
 	id = "misc_synth_bag_tag_wardtaka"
-	materials = list(MAT_STEEL = 1000, "glass" = 500, "plastic" = 1000)
+	materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000)
 	build_path = /obj/item/clothing/accessory/badge/corporate_tag/wardtaka
 
 /datum/design/item/prosfab/badge_zenghu
 	name = "Zeng-Hu Tag"
 	desc = "Used to identify an empty Zeng-Hu FBP."
 	id = "misc_synth_bag_tag_zenghu"
-	materials = list(MAT_STEEL = 1000, "glass" = 500, "plastic" = 1000)
+	materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000)
 	build_path = /obj/item/clothing/accessory/badge/corporate_tag/zenghu
 
 /datum/design/item/prosfab/badge_gilthari
 	name = "Gilthari Tag"
 	desc = "Used to identify an empty Gilthari FBP."
 	id = "misc_synth_bag_tag_gilthari"
-	materials = list(MAT_STEEL = 1000, "glass" = 500, "gold" = 1000)
+	materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_GOLD = 1000)
 	build_path = /obj/item/clothing/accessory/badge/corporate_tag/gilthari
 	req_tech = list(TECH_MATERIAL = 4, TECH_ILLEGAL = 2, TECH_PHORON = 2)
 
@@ -490,7 +490,7 @@
 	name = "Vey-Medical Tag"
 	desc = "Used to identify an empty Vey-Medical FBP."
 	id = "misc_synth_bag_tag_veymed"
-	materials = list(MAT_STEEL = 1000, "glass" = 500, "plastic" = 1000)
+	materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000)
 	build_path = /obj/item/clothing/accessory/badge/corporate_tag/veymed
 	req_tech = list(TECH_MATERIAL = 3, TECH_ILLEGAL = 1, TECH_BIO = 4)
 
@@ -498,26 +498,26 @@
 	name = "Hephaestus Tag"
 	desc = "Used to identify an empty Hephaestus FBP."
 	id = "misc_synth_bag_tag_heph"
-	materials = list(MAT_STEEL = 1000, "glass" = 500, "plastic" = 1000)
+	materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000)
 	build_path = /obj/item/clothing/accessory/badge/corporate_tag/hephaestus
 
 /datum/design/item/prosfab/badge_grayson
 	name = "Grayson Tag"
 	desc = "Used to identify an empty Grayson FBP."
 	id = "misc_synth_bag_tag_grayson"
-	materials = list(MAT_STEEL = 1000, "glass" = 500, "plastic" = 1000)
+	materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000)
 	build_path = /obj/item/clothing/accessory/badge/corporate_tag/grayson
 
 /datum/design/item/prosfab/badge_xion
 	name = "Xion Tag"
 	desc = "Used to identify an empty Xion FBP."
 	id = "misc_synth_bag_tag_xion"
-	materials = list(MAT_STEEL = 1000, "glass" = 500, "plastic" = 1000)
+	materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000)
 	build_path = /obj/item/clothing/accessory/badge/corporate_tag/xion
 
 /datum/design/item/prosfab/badge_bishop
 	name = "Bishop Tag"
 	desc = "Used to identify an empty Bishop FBP."
 	id = "misc_synth_bag_tag_bishop"
-	materials = list(MAT_STEEL = 500, "glass" = 2000, "plastic" = 500)
+	materials = list(MAT_STEEL = 500, MAT_GLASS = 2000, MAT_PLASTIC = 500)
 	build_path = /obj/item/clothing/accessory/badge/corporate_tag/bishop