diff --git a/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (2801).blk b/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (2801).blk
index 62b40a72ffa..85414680de3 100644
--- a/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (2801).blk
+++ b/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (2801).blk
@@ -123,7 +123,7 @@ Medium Laser
-MASH Core Component
+MASH Equipment:SIZE:1
diff --git a/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (3035)Dove.blk b/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (3035)Dove.blk
index 968ff9086e1..dacc8a7015b 100644
--- a/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (3035)Dove.blk
+++ b/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (3035)Dove.blk
@@ -122,16 +122,7 @@ Medium Laser
-MASH Core Component
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
+MASH Equipment:SIZE:10
diff --git a/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (3054).blk b/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (3054).blk
index 30cdc7d8932..2ea1c7781d3 100644
--- a/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (3054).blk
+++ b/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (3054).blk
@@ -124,7 +124,7 @@ Medium Laser
-MASH Core Component
+MASH Equipment:SIZE:1
diff --git a/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (3079).blk b/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (3079).blk
index d454d8bd8f9..646b59d3288 100644
--- a/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (3079).blk
+++ b/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (3079).blk
@@ -119,7 +119,7 @@ ISERMediumLaser
-MASH Core Component
+MASH Equipment:SIZE:1
diff --git a/megamek/data/mekfiles/dropships/TRO3057R/IS/Seeker (2815M).blk b/megamek/data/mekfiles/dropships/TRO3057R/IS/Seeker (2815M).blk
index d5184d53355..2500e255ffe 100644
--- a/megamek/data/mekfiles/dropships/TRO3057R/IS/Seeker (2815M).blk
+++ b/megamek/data/mekfiles/dropships/TRO3057R/IS/Seeker (2815M).blk
@@ -115,7 +115,7 @@ Medium Laser
-MASH Core Component
+MASH Equipment:SIZE:1
diff --git a/megamek/data/mekfiles/dropships/TRO3057R/IS/Seeker (3054).blk b/megamek/data/mekfiles/dropships/TRO3057R/IS/Seeker (3054).blk
index 91280b39a16..7864de3d288 100644
--- a/megamek/data/mekfiles/dropships/TRO3057R/IS/Seeker (3054).blk
+++ b/megamek/data/mekfiles/dropships/TRO3057R/IS/Seeker (3054).blk
@@ -118,7 +118,7 @@ Medium Laser
-MASH Core Component
+MASH Equipment:SIZE:1
diff --git a/megamek/data/mekfiles/jumpships/3057R/IS/Magellan Jumpship (2960).blk b/megamek/data/mekfiles/jumpships/3057R/IS/Magellan Jumpship (2960).blk
index 28712813216..1864233871b 100644
--- a/megamek/data/mekfiles/jumpships/3057R/IS/Magellan Jumpship (2960).blk
+++ b/megamek/data/mekfiles/jumpships/3057R/IS/Magellan Jumpship (2960).blk
@@ -143,7 +143,7 @@ ISAMS Ammo:24
-MASH Core Component
+MASH Equipment:SIZE:1
ISMobileHPG
diff --git a/megamek/data/mekfiles/vehicles/3039u/MASH Truck (ICE).blk b/megamek/data/mekfiles/vehicles/3039u/MASH Truck (ICE).blk
index 5dffb4fa8be..8a5ce492e31 100644
--- a/megamek/data/mekfiles/vehicles/3039u/MASH Truck (ICE).blk
+++ b/megamek/data/mekfiles/vehicles/3039u/MASH Truck (ICE).blk
@@ -56,11 +56,7 @@ Wheeled
-MASH core component
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
+MASH Equipment:SIZE:5
diff --git a/megamek/data/mekfiles/vehicles/3039u/MASH Truck.blk b/megamek/data/mekfiles/vehicles/3039u/MASH Truck.blk
index b2cbd69fa15..77a855a04e6 100644
--- a/megamek/data/mekfiles/vehicles/3039u/MASH Truck.blk
+++ b/megamek/data/mekfiles/vehicles/3039u/MASH Truck.blk
@@ -57,11 +57,7 @@ Wheeled
-MASH core component
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
+MASH Equipment:SIZE:5
diff --git a/megamek/data/mekfiles/vehicles/3075/Saxon APC (MASH).blk b/megamek/data/mekfiles/vehicles/3075/Saxon APC (MASH).blk
index 2eab5a03c0b..89fc29777a4 100644
--- a/megamek/data/mekfiles/vehicles/3075/Saxon APC (MASH).blk
+++ b/megamek/data/mekfiles/vehicles/3075/Saxon APC (MASH).blk
@@ -61,8 +61,7 @@ Hover
-MASH core component
-MASH Operation Theater
+MASH Equipment:SIZE:2
IS Ammo MG - Full
diff --git a/megamek/data/mekfiles/vehicles/XTRs/Primitives III/Carter MERV.blk b/megamek/data/mekfiles/vehicles/XTRs/Primitives III/Carter MERV.blk
index 9b4f2be8b25..66d8a7577d1 100644
--- a/megamek/data/mekfiles/vehicles/XTRs/Primitives III/Carter MERV.blk
+++ b/megamek/data/mekfiles/vehicles/XTRs/Primitives III/Carter MERV.blk
@@ -64,10 +64,9 @@ cargobay:2.0:1:1
-MASH Operation Theater
+MASH Equipment:SIZE:2
Paramedic Equipment
ISOffRoadChassis
-MASH Core Component
diff --git a/megamek/data/mekfiles/vehicles/XTRs/RetroTech/White Tip Submarine.blk b/megamek/data/mekfiles/vehicles/XTRs/RetroTech/White Tip Submarine.blk
index 0cc9ca674bf..2cf9f16a0e0 100644
--- a/megamek/data/mekfiles/vehicles/XTRs/RetroTech/White Tip Submarine.blk
+++ b/megamek/data/mekfiles/vehicles/XTRs/RetroTech/White Tip Submarine.blk
@@ -89,7 +89,7 @@ IS Ammo LRTorpedo-10
IS Ammo LRTorpedo-10
Communications Equipment (7 ton)
FieldKitchen
-MASH Core Component
+MASH Equipment:SIZE:1