diff --git a/ChangeLog.md b/ChangeLog.md
index 355a261..249ab45 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -6,6 +6,7 @@
   * Add long range / wide angle / fast scan scanner blueprints
   * Fix EDDB IDs for class 5 and 7 fighter hangars for correct shopping list
   * Fix cost for rocket-propelled FSD disruptor
+  * Add module names for blueprints
 
 #2.2.19
   * Remove shot speed modification - it is directly tied to range
diff --git a/dist/index.js b/dist/index.js
index 85fd470..1cc14db 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -14315,6 +14315,7 @@ module.exports = {
           }
         },
         id: 3,
+        modulename: [ "Auto field mainentance unit", "AFMU" ],
         name: "Shielded"
       },
       Armour_Advanced: {
@@ -14388,6 +14389,7 @@ module.exports = {
           }
         },
         id: 6,
+        modulename: [ "Bulkheads", "Armour" ],
         name: "Lightweight"
       },
       Armour_Explosive: {
@@ -14450,6 +14452,7 @@ module.exports = {
           }
         },
         id: 5,
+        modulename: [ "Bulkheads", "Armour" ],
         name: "Blast resistant"
       },
       Armour_HeavyDuty: {
@@ -14523,6 +14526,7 @@ module.exports = {
           }
         },
         id: 7,
+        modulename: [ "Bulkheads", "Armour" ],
         name: "Heavy duty"
       },
       Armour_Kinetic: {
@@ -14586,6 +14590,7 @@ module.exports = {
           }
         },
         id: 4,
+        modulename: [ "Bulkheads", "Armour" ],
         name: "Kinetic resistant"
       },
       Armour_Thermic: {
@@ -14641,6 +14646,7 @@ module.exports = {
           }
         },
         id: 8,
+        modulename: [ "Bulkheads", "Armour" ],
         name: "Thermal resistant"
       },
       CargoScanner_LightWeight: {
@@ -14699,6 +14705,7 @@ module.exports = {
           }
         },
         id: 9,
+        modulename: [ "Cargo scanner", "Manifest scanner" ],
         name: "Lightweight"
       },
       CargoScanner_Reinforced: {
@@ -14757,6 +14764,7 @@ module.exports = {
           }
         },
         id: 10,
+        modulename: [ "Cargo scanner", "Manifest scanner" ],
         name: "Reinforced"
       },
       CargoScanner_Shielded: {
@@ -14815,6 +14823,7 @@ module.exports = {
           }
         },
         id: 11,
+        modulename: [ "Cargo scanner", "Manifest scanner" ],
         name: "Shielded"
       },
       ChaffLauncher_ChaffCapacity: {
@@ -14833,6 +14842,7 @@ module.exports = {
           }
         },
         id: 12,
+        modulename: [ "Chaff launcher" ],
         name: "Ammo capacity"
       },
       ChaffLauncher_LightWeight: {
@@ -14891,6 +14901,7 @@ module.exports = {
           }
         },
         id: 13,
+        modulename: [ "Chaff launcher" ],
         name: "Lightweight"
       },
       ChaffLauncher_Reinforced: {
@@ -14949,6 +14960,7 @@ module.exports = {
           }
         },
         id: 14,
+        modulename: [ "Chaff launcher" ],
         name: "Reinforced"
       },
       ChaffLauncher_Shielded: {
@@ -15007,6 +15019,7 @@ module.exports = {
           }
         },
         id: 15,
+        modulename: [ "Chaff launcher" ],
         name: "Shielded"
       },
       CollectionLimpet_LightWeight: {
@@ -15065,6 +15078,7 @@ module.exports = {
           }
         },
         id: 16,
+        modulename: [ "Collector limpet controller" ],
         name: "Lightweight"
       },
       CollectionLimpet_Reinforced: {
@@ -15123,6 +15137,7 @@ module.exports = {
           }
         },
         id: 17,
+        modulename: [ "Collector limpet controller" ],
         name: "Reinforced"
       },
       CollectionLimpet_Shielded: {
@@ -15181,6 +15196,7 @@ module.exports = {
           }
         },
         id: 18,
+        modulename: [ "Collector limpet controller" ],
         name: "Shielded"
       },
       ECM_LightWeight: {
@@ -15239,6 +15255,7 @@ module.exports = {
           }
         },
         id: 19,
+        modulename: [ "Electronic counter measures", "ECM" ],
         name: "Lightweight"
       },
       ECM_Reinforced: {
@@ -15297,6 +15314,7 @@ module.exports = {
           }
         },
         id: 20,
+        modulename: [ "Electronic counter measures", "ECM" ],
         name: "Reinforced"
       },
       ECM_Shielded: {
@@ -15355,6 +15373,7 @@ module.exports = {
           }
         },
         id: 21,
+        modulename: [ "Electronic counter measures", "ECM" ],
         name: "Shielded"
       },
       Engine_Dirty: {
@@ -15428,6 +15447,7 @@ module.exports = {
           }
         },
         id: 22,
+        modulename: [ "Thrusters", "Engines" ],
         name: "Dirty"
       },
       Engine_Reinforced: {
@@ -15496,6 +15516,7 @@ module.exports = {
           }
         },
         id: 23,
+        modulename: [ "Thrusters", "Engines" ],
         name: "Reinforced"
       },
       Engine_Tuned: {
@@ -15569,6 +15590,7 @@ module.exports = {
           }
         },
         id: 24,
+        modulename: [ "Thrusters", "Engines" ],
         name: "Clean"
       },
       FSD_FastBoot: {
@@ -15637,6 +15659,7 @@ module.exports = {
           }
         },
         id: 25,
+        modulename: [ "Frame shift drive", "FSD" ],
         name: "Faster boot sequence"
       },
       FSD_LongRange: {
@@ -15705,6 +15728,7 @@ module.exports = {
           }
         },
         id: 26,
+        modulename: [ "Frame shift drive", "FSD" ],
         name: "Increased range"
       },
       FSD_Shielded: {
@@ -15773,6 +15797,7 @@ module.exports = {
           }
         },
         id: 27,
+        modulename: [ "Frame shift drive", "FSD" ],
         name: "Shielded"
       },
       FSDinterdictor_Expanded: {
@@ -15824,6 +15849,7 @@ module.exports = {
           }
         },
         id: 28,
+        modulename: [ "Frame shift drive interdictor", "FSDI" ],
         name: "Expanded capture arc"
       },
       FSDinterdictor_LongRange: {
@@ -15866,6 +15892,7 @@ module.exports = {
           }
         },
         id: 29,
+        modulename: [ "Frame shift drive interdictor", "FSDI" ],
         name: "Long range"
       },
       FuelScoop_Shielded: {
@@ -15913,6 +15940,7 @@ module.exports = {
           }
         },
         id: 30,
+        modulename: [ "Fuel scoop" ],
         name: "Shielded"
       },
       FuelTransferLimpet_LightWeight: {
@@ -15971,6 +15999,7 @@ module.exports = {
           }
         },
         id: 31,
+        modulename: [ "Fuel transfer limpet controller" ],
         name: "Lightweight"
       },
       FuelTransferLimpet_Reinforced: {
@@ -16029,6 +16058,7 @@ module.exports = {
           }
         },
         id: 32,
+        modulename: [ "Fuel transfer limpet controller" ],
         name: "Reinforced"
       },
       FuelTransferLimpet_Shielded: {
@@ -16087,6 +16117,7 @@ module.exports = {
           }
         },
         id: 33,
+        modulename: [ "Fuel transfer limpet controller" ],
         name: "Shielded"
       },
       HatchBreakerLimpet_LightWeight: {
@@ -16145,6 +16176,7 @@ module.exports = {
           }
         },
         id: 34,
+        modulename: [ "Hatch breaker limpet controller" ],
         name: "Lightweight"
       },
       HatchBreakerLimpet_Reinforced: {
@@ -16203,6 +16235,7 @@ module.exports = {
           }
         },
         id: 35,
+        modulename: [ "Hatch breaker limpet controller" ],
         name: "Reinforced"
       },
       HatchBreakerLimpet_Shielded: {
@@ -16261,6 +16294,7 @@ module.exports = {
           }
         },
         id: 36,
+        modulename: [ "Hatch breaker limpet controller" ],
         name: "Shielded"
       },
       HeatSinkLauncher_HeatSinkCapacity: {
@@ -16279,6 +16313,7 @@ module.exports = {
           }
         },
         id: 37,
+        modulename: [ "Heat sink launcher" ],
         name: "Ammo capacity"
       },
       HeatSinkLauncher_LightWeight: {
@@ -16337,6 +16372,7 @@ module.exports = {
           }
         },
         id: 38,
+        modulename: [ "Heat sink launcher" ],
         name: "Lightweight"
       },
       HeatSinkLauncher_Reinforced: {
@@ -16395,6 +16431,7 @@ module.exports = {
           }
         },
         id: 39,
+        modulename: [ "Heat sink launcher" ],
         name: "Reinforced"
       },
       HeatSinkLauncher_Shielded: {
@@ -16453,6 +16490,7 @@ module.exports = {
           }
         },
         id: 40,
+        modulename: [ "Heat sink launcher" ],
         name: "Shielded"
       },
       HullReinforcement_Advanced: {
@@ -16516,6 +16554,7 @@ module.exports = {
           }
         },
         id: 41,
+        modulename: [ "Hull reinforcement", "Hull reinforcement package", "HRP" ],
         name: "Lightweight"
       },
       HullReinforcement_Explosive: {
@@ -16579,6 +16618,7 @@ module.exports = {
           }
         },
         id: 43,
+        modulename: [ "Hull reinforcement", "Hull reinforcement package", "HRP" ],
         name: "Blast resistant"
       },
       HullReinforcement_HeavyDuty: {
@@ -16652,6 +16692,7 @@ module.exports = {
           }
         },
         id: 42,
+        modulename: [ "Hull reinforcement", "Hull reinforcement package", "HRP" ],
         name: "Heavy duty"
       },
       HullReinforcement_Kinetic: {
@@ -16715,6 +16756,7 @@ module.exports = {
           }
         },
         id: 44,
+        modulename: [ "Hull reinforcement", "Hull reinforcement package", "HRP" ],
         name: "Kinetic resistant"
       },
       HullReinforcement_Thermic: {
@@ -16778,6 +16820,7 @@ module.exports = {
           }
         },
         id: 45,
+        modulename: [ "Hull reinforcement", "Hull reinforcement package", "HRP" ],
         name: "Thermal resistant"
       },
       KillWarrantScanner_LightWeight: {
@@ -16836,6 +16879,7 @@ module.exports = {
           }
         },
         id: 46,
+        modulename: [ "Kill warrant scanner", "KWS" ],
         name: "Lightweight"
       },
       KillWarrantScanner_LongRange: {
@@ -16899,6 +16943,7 @@ module.exports = {
           }
         },
         id: 99,
+        modulename: [ "Kill warrant scanner", "KWS" ],
         name: "Long range"
       },
       KillWarrantScanner_Reinforced: {
@@ -16957,6 +17002,7 @@ module.exports = {
           }
         },
         id: 47,
+        modulename: [ "Kill warrant scanner", "KWS" ],
         name: "Reinforced"
       },
       KillWarrantScanner_Shielded: {
@@ -17015,6 +17061,7 @@ module.exports = {
           }
         },
         id: 48,
+        modulename: [ "Kill warrant scanner", "KWS" ],
         name: "Shielded"
       },
       LifeSupport_LightWeight: {
@@ -17062,6 +17109,7 @@ module.exports = {
           }
         },
         id: 49,
+        modulename: [ "Life support" ],
         name: "Lightweight"
       },
       LifeSupport_Reinforced: {
@@ -17109,6 +17157,7 @@ module.exports = {
           }
         },
         id: 50,
+        modulename: [ "Life support" ],
         name: "Reinforced"
       },
       LifeSupport_Shielded: {
@@ -17156,6 +17205,7 @@ module.exports = {
           }
         },
         id: 51,
+        modulename: [ "Life support" ],
         name: "Shielded"
       },
       PointDefence_LightWeight: {
@@ -17214,6 +17264,7 @@ module.exports = {
           }
         },
         id: 52,
+        modulename: [ "Point defence" ],
         name: "Lightweight"
       },
       PointDefence_PointDefenseCapacity: {
@@ -17232,6 +17283,7 @@ module.exports = {
           }
         },
         id: 55,
+        modulename: [ "Point defence" ],
         name: "Ammo capacity"
       },
       PointDefence_Reinforced: {
@@ -17290,6 +17342,7 @@ module.exports = {
           }
         },
         id: 53,
+        modulename: [ "Point defence" ],
         name: "Reinforced"
       },
       PointDefence_Shielded: {
@@ -17348,6 +17401,7 @@ module.exports = {
           }
         },
         id: 54,
+        modulename: [ "Point defence" ],
         name: "Shielded"
       },
       PowerDistributor_HighCapacity: {
@@ -17426,6 +17480,7 @@ module.exports = {
           }
         },
         id: 56,
+        modulename: [ "Power distributor", "Distributor" ],
         name: "High charge capacity"
       },
       PowerDistributor_HighFrequency: {
@@ -17504,6 +17559,7 @@ module.exports = {
           }
         },
         id: 57,
+        modulename: [ "Power distributor", "Distributor" ],
         name: "Charge enhanced"
       },
       PowerDistributor_PriorityEngines: {
@@ -17552,6 +17608,7 @@ module.exports = {
           }
         },
         id: 58,
+        modulename: [ "Power distributor", "Distributor" ],
         name: "Engine focused"
       },
       PowerDistributor_PrioritySystems: {
@@ -17600,6 +17657,7 @@ module.exports = {
           }
         },
         id: 59,
+        modulename: [ "Power distributor", "Distributor" ],
         name: "System focused"
       },
       PowerDistributor_PriorityWeapons: {
@@ -17648,6 +17706,7 @@ module.exports = {
           }
         },
         id: 60,
+        modulename: [ "Power distributor", "Distributor" ],
         name: "Weapon focused"
       },
       PowerDistributor_Shielded: {
@@ -17706,6 +17765,7 @@ module.exports = {
           }
         },
         id: 61,
+        modulename: [ "Power distributor", "Distributor" ],
         name: "Shielded"
       },
       PowerPlant_Armoured: {
@@ -17769,6 +17829,7 @@ module.exports = {
           }
         },
         id: 62,
+        modulename: [ "Power distributor", "Distributor" ],
         name: "Armoured"
       },
       PowerPlant_Boosted: {
@@ -17832,6 +17893,7 @@ module.exports = {
           }
         },
         id: 63,
+        modulename: [ "Power distributor", "Distributor" ],
         name: "Overcharged"
       },
       PowerPlant_Stealth: {
@@ -17871,6 +17933,7 @@ module.exports = {
           }
         },
         id: 64,
+        modulename: [ "Power distributor", "Distributor" ],
         name: "Low emissions"
       },
       ProspectingLimpet_LightWeight: {
@@ -17929,6 +17992,7 @@ module.exports = {
           }
         },
         id: 65,
+        modulename: [ "Prospector limpet controller" ],
         name: "Lightweight"
       },
       ProspectingLimpet_Reinforced: {
@@ -17987,6 +18051,7 @@ module.exports = {
           }
         },
         id: 66,
+        modulename: [ "Prospector limpet controller" ],
         name: "Reinforced"
       },
       ProspectingLimpet_Shielded: {
@@ -18045,6 +18110,7 @@ module.exports = {
           }
         },
         id: 67,
+        modulename: [ "Prospector limpet controller" ],
         name: "Shielded"
       },
       Refineries_Shielded: {
@@ -18092,6 +18158,7 @@ module.exports = {
           }
         },
         id: 92,
+        modulename: [ "Refinery" ],
         name: "Shielded"
       },
       Sensor_CargoScanner_FastScan: {
@@ -18155,6 +18222,7 @@ module.exports = {
           }
         },
         id: 102,
+        modulename: [ "Cargo scanner", "Manifest scanner" ],
         name: "Fast scan"
       },
       Sensor_CargoScanner_LongRange: {
@@ -18218,6 +18286,7 @@ module.exports = {
           }
         },
         id: 104,
+        modulename: [ "Cargo scanner", "Manifest scanner" ],
         name: "Long range"
       },
       Sensor_CargoScanner_WideAngle: {
@@ -18281,6 +18350,7 @@ module.exports = {
           }
         },
         id: 105,
+        modulename: [ "Cargo scanner", "Manifest scanner" ],
         name: "Wide angle"
       },
       Sensor_KillWarrantScanner_FastScan: {
@@ -18344,6 +18414,7 @@ module.exports = {
           }
         },
         id: 101,
+        modulename: [ "Kill warrant scanner", "KWS" ],
         name: "Fast scan"
       },
       Sensor_KillWarrantScanner_WideAngle: {
@@ -18407,6 +18478,7 @@ module.exports = {
           }
         },
         id: 107,
+        modulename: [ "Kill warrant scanner", "KWS" ],
         name: "Wide angle"
       },
       Sensor_Sensor_LightWeight: {
@@ -18470,6 +18542,7 @@ module.exports = {
           }
         },
         id: 96,
+        modulename: [ "Sensors" ],
         name: "Lightweight"
       },
       Sensor_Sensor_LongRange: {
@@ -18533,6 +18606,7 @@ module.exports = {
           }
         },
         id: 97,
+        modulename: [ "Sensors" ],
         name: "Long range"
       },
       Sensor_Sensor_WideAngle: {
@@ -18596,6 +18670,7 @@ module.exports = {
           }
         },
         id: 98,
+        modulename: [ "Sensors" ],
         name: "Wide angle"
       },
       Sensor_SurfaceScanner_FastScan: {
@@ -18659,6 +18734,7 @@ module.exports = {
           }
         },
         id: 95,
+        modulename: [ "Detailed surface scanner", "DSS" ],
         name: "Fast scan"
       },
       Sensor_SurfaceScanner_LongRange: {
@@ -18722,6 +18798,7 @@ module.exports = {
           }
         },
         id: 93,
+        modulename: [ "Detailed surface scanner", "DSS" ],
         name: "Long range"
       },
       Sensor_SurfaceScanner_WideAngle: {
@@ -18785,6 +18862,7 @@ module.exports = {
           }
         },
         id: 94,
+        modulename: [ "Detailed surface scanner", "DSS" ],
         name: "Wide angle"
       },
       Sensor_WakeScanner_FastScan: {
@@ -18848,6 +18926,7 @@ module.exports = {
           }
         },
         id: 109,
+        modulename: [ "Wake scanner", "Frame shift wake scanner" ],
         name: "Fast scan"
       },
       Sensor_WakeScanner_LongRange: {
@@ -18911,6 +18990,7 @@ module.exports = {
           }
         },
         id: 108,
+        modulename: [ "Wake scanner", "Frame shift wake scanner" ],
         name: "Long range"
       },
       Sensor_WakeScanner_WideAngle: {
@@ -18974,6 +19054,7 @@ module.exports = {
           }
         },
         id: 106,
+        modulename: [ "Wake scanner", "Frame shift wake scanner" ],
         name: "Wide angle"
       },
       ShieldBooster_Explosive: {
@@ -19037,6 +19118,7 @@ module.exports = {
           }
         },
         id: 68,
+        modulename: [ "Shield booster" ],
         name: "Blast resistant"
       },
       ShieldBooster_HeavyDuty: {
@@ -19105,6 +19187,7 @@ module.exports = {
           }
         },
         id: 69,
+        modulename: [ "Shield booster" ],
         name: "Heavy duty"
       },
       ShieldBooster_Kinetic: {
@@ -19168,6 +19251,7 @@ module.exports = {
           }
         },
         id: 70,
+        modulename: [ "Shield booster" ],
         name: "Kinetic resistant"
       },
       ShieldBooster_Resistive: {
@@ -19241,6 +19325,7 @@ module.exports = {
           }
         },
         id: 71,
+        modulename: [ "Shield booster" ],
         name: "Resistance augmented"
       },
       ShieldBooster_Thermic: {
@@ -19304,6 +19389,7 @@ module.exports = {
           }
         },
         id: 72,
+        modulename: [ "Shield booster" ],
         name: "Thermal resistant"
       },
       ShieldCellBank_Rapid: {
@@ -19346,6 +19432,7 @@ module.exports = {
           }
         },
         id: 73,
+        modulename: [ "Shield cell bank", "SCB" ],
         name: "Rapid charge"
       },
       ShieldCellBank_Specialised: {
@@ -19388,6 +19475,7 @@ module.exports = {
           }
         },
         id: 74,
+        modulename: [ "Shield cell bank", "SCB" ],
         name: "Specialised"
       },
       ShieldGenerator_Kinetic: {
@@ -19451,6 +19539,7 @@ module.exports = {
           }
         },
         id: 75,
+        modulename: [ "Shield generator", "Shields" ],
         name: "Kinetic resistant"
       },
       ShieldGenerator_Optimised: {
@@ -19522,6 +19611,7 @@ module.exports = {
           }
         },
         id: 76,
+        modulename: [ "Shield generator", "Shields" ],
         name: "Enhanced low power"
       },
       ShieldGenerator_Reinforced: {
@@ -19602,6 +19692,7 @@ module.exports = {
           }
         },
         id: 77,
+        modulename: [ "Shield generator", "Shields" ],
         name: "Reinforced"
       },
       ShieldGenerator_Thermic: {
@@ -19665,6 +19756,7 @@ module.exports = {
           }
         },
         id: 78,
+        modulename: [ "Shield generator", "Shields" ],
         name: "Thermal resistant"
       },
       WakeScanner_LightWeight: {
@@ -19723,6 +19815,7 @@ module.exports = {
           }
         },
         id: 79,
+        modulename: [ "Frame shift wake scanner", "Wake scanner" ],
         name: "Lightweight"
       },
       WakeScanner_Reinforced: {
@@ -19781,6 +19874,7 @@ module.exports = {
           }
         },
         id: 81,
+        modulename: [ "Frame shift wake scanner", "Wake scanner" ],
         name: "Reinforced"
       },
       WakeScanner_Shielded: {
@@ -19839,6 +19933,7 @@ module.exports = {
           }
         },
         id: 80,
+        modulename: [ "Frame shift wake scanner", "Wake scanner" ],
         name: "Shielded"
       },
       Weapon_DoubleShot: {
@@ -19907,6 +20002,7 @@ module.exports = {
           }
         },
         id: 82,
+        modulename: [ "Weapon" ],
         name: "Double shot"
       },
       Weapon_Efficient: {
@@ -19972,6 +20068,7 @@ module.exports = {
           }
         },
         id: 83,
+        modulename: [ "Weapon" ],
         name: "Efficient"
       },
       Weapon_Focused: {
@@ -20039,6 +20136,7 @@ module.exports = {
           }
         },
         id: 84,
+        modulename: [ "Weapon" ],
         name: "Focused"
       },
       Weapon_HighCapacity: {
@@ -20112,6 +20210,7 @@ module.exports = {
           }
         },
         id: 85,
+        modulename: [ "Weapon" ],
         name: "High capacity"
       },
       Weapon_LightWeight: {
@@ -20180,6 +20279,7 @@ module.exports = {
           }
         },
         id: 86,
+        modulename: [ "Weapon" ],
         name: "Lightweight"
       },
       Weapon_LongRange: {
@@ -20247,6 +20347,7 @@ module.exports = {
           }
         },
         id: 87,
+        modulename: [ "Weapon" ],
         name: "Long range"
       },
       Weapon_Overcharged: {
@@ -20317,6 +20418,7 @@ module.exports = {
           }
         },
         id: 88,
+        modulename: [ "Weapon" ],
         name: "Overcharged"
       },
       Weapon_RapidFire: {
@@ -20389,6 +20491,7 @@ module.exports = {
           }
         },
         id: 89,
+        modulename: [ "Weapon" ],
         name: "Rapid fire"
       },
       Weapon_ShortRange: {
@@ -20454,6 +20557,7 @@ module.exports = {
           }
         },
         id: 90,
+        modulename: [ "Weapon" ],
         name: "Short range"
       },
       Weapon_Sturdy: {
@@ -20520,6 +20624,7 @@ module.exports = {
           }
         },
         id: 91,
+        modulename: [ "Weapon" ],
         name: "Sturdy"
       }
     },
diff --git a/dist/index.json b/dist/index.json
index 198b516..a418178 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -16833,6 +16833,10 @@
 					}
 				},
 				"id": 3,
+				"modulename": [
+					"Auto field mainentance unit",
+					"AFMU"
+				],
 				"name": "Shielded"
 			},
 			"Armour_Advanced": {
@@ -16981,6 +16985,10 @@
 					}
 				},
 				"id": 6,
+				"modulename": [
+					"Bulkheads",
+					"Armour"
+				],
 				"name": "Lightweight"
 			},
 			"Armour_Explosive": {
@@ -17088,6 +17096,10 @@
 					}
 				},
 				"id": 5,
+				"modulename": [
+					"Bulkheads",
+					"Armour"
+				],
 				"name": "Blast resistant"
 			},
 			"Armour_HeavyDuty": {
@@ -17236,6 +17248,10 @@
 					}
 				},
 				"id": 7,
+				"modulename": [
+					"Bulkheads",
+					"Armour"
+				],
 				"name": "Heavy duty"
 			},
 			"Armour_Kinetic": {
@@ -17344,6 +17360,10 @@
 					}
 				},
 				"id": 4,
+				"modulename": [
+					"Bulkheads",
+					"Armour"
+				],
 				"name": "Kinetic resistant"
 			},
 			"Armour_Thermic": {
@@ -17444,6 +17464,10 @@
 					}
 				},
 				"id": 8,
+				"modulename": [
+					"Bulkheads",
+					"Armour"
+				],
 				"name": "Thermal resistant"
 			},
 			"CargoScanner_LightWeight": {
@@ -17532,6 +17556,10 @@
 					}
 				},
 				"id": 9,
+				"modulename": [
+					"Cargo scanner",
+					"Manifest scanner"
+				],
 				"name": "Lightweight"
 			},
 			"CargoScanner_Reinforced": {
@@ -17620,6 +17648,10 @@
 					}
 				},
 				"id": 10,
+				"modulename": [
+					"Cargo scanner",
+					"Manifest scanner"
+				],
 				"name": "Reinforced"
 			},
 			"CargoScanner_Shielded": {
@@ -17708,6 +17740,10 @@
 					}
 				},
 				"id": 11,
+				"modulename": [
+					"Cargo scanner",
+					"Manifest scanner"
+				],
 				"name": "Shielded"
 			},
 			"ChaffLauncher_ChaffCapacity": {
@@ -17735,6 +17771,9 @@
 					}
 				},
 				"id": 12,
+				"modulename": [
+					"Chaff launcher"
+				],
 				"name": "Ammo capacity"
 			},
 			"ChaffLauncher_LightWeight": {
@@ -17823,6 +17862,9 @@
 					}
 				},
 				"id": 13,
+				"modulename": [
+					"Chaff launcher"
+				],
 				"name": "Lightweight"
 			},
 			"ChaffLauncher_Reinforced": {
@@ -17911,6 +17953,9 @@
 					}
 				},
 				"id": 14,
+				"modulename": [
+					"Chaff launcher"
+				],
 				"name": "Reinforced"
 			},
 			"ChaffLauncher_Shielded": {
@@ -17999,6 +18044,9 @@
 					}
 				},
 				"id": 15,
+				"modulename": [
+					"Chaff launcher"
+				],
 				"name": "Shielded"
 			},
 			"CollectionLimpet_LightWeight": {
@@ -18087,6 +18135,9 @@
 					}
 				},
 				"id": 16,
+				"modulename": [
+					"Collector limpet controller"
+				],
 				"name": "Lightweight"
 			},
 			"CollectionLimpet_Reinforced": {
@@ -18175,6 +18226,9 @@
 					}
 				},
 				"id": 17,
+				"modulename": [
+					"Collector limpet controller"
+				],
 				"name": "Reinforced"
 			},
 			"CollectionLimpet_Shielded": {
@@ -18263,6 +18317,9 @@
 					}
 				},
 				"id": 18,
+				"modulename": [
+					"Collector limpet controller"
+				],
 				"name": "Shielded"
 			},
 			"ECM_LightWeight": {
@@ -18351,6 +18408,10 @@
 					}
 				},
 				"id": 19,
+				"modulename": [
+					"Electronic counter measures",
+					"ECM"
+				],
 				"name": "Lightweight"
 			},
 			"ECM_Reinforced": {
@@ -18439,6 +18500,10 @@
 					}
 				},
 				"id": 20,
+				"modulename": [
+					"Electronic counter measures",
+					"ECM"
+				],
 				"name": "Reinforced"
 			},
 			"ECM_Shielded": {
@@ -18527,6 +18592,10 @@
 					}
 				},
 				"id": 21,
+				"modulename": [
+					"Electronic counter measures",
+					"ECM"
+				],
 				"name": "Shielded"
 			},
 			"Engine_Dirty": {
@@ -18675,6 +18744,10 @@
 					}
 				},
 				"id": 22,
+				"modulename": [
+					"Thrusters",
+					"Engines"
+				],
 				"name": "Dirty"
 			},
 			"Engine_Reinforced": {
@@ -18803,6 +18876,10 @@
 					}
 				},
 				"id": 23,
+				"modulename": [
+					"Thrusters",
+					"Engines"
+				],
 				"name": "Reinforced"
 			},
 			"Engine_Tuned": {
@@ -18951,6 +19028,10 @@
 					}
 				},
 				"id": 24,
+				"modulename": [
+					"Thrusters",
+					"Engines"
+				],
 				"name": "Clean"
 			},
 			"FSD_FastBoot": {
@@ -19079,6 +19160,10 @@
 					}
 				},
 				"id": 25,
+				"modulename": [
+					"Frame shift drive",
+					"FSD"
+				],
 				"name": "Faster boot sequence"
 			},
 			"FSD_LongRange": {
@@ -19207,6 +19292,10 @@
 					}
 				},
 				"id": 26,
+				"modulename": [
+					"Frame shift drive",
+					"FSD"
+				],
 				"name": "Increased range"
 			},
 			"FSD_Shielded": {
@@ -19335,6 +19424,10 @@
 					}
 				},
 				"id": 27,
+				"modulename": [
+					"Frame shift drive",
+					"FSD"
+				],
 				"name": "Shielded"
 			},
 			"FSDinterdictor_Expanded": {
@@ -19422,6 +19515,10 @@
 					}
 				},
 				"id": 28,
+				"modulename": [
+					"Frame shift drive interdictor",
+					"FSDI"
+				],
 				"name": "Expanded capture arc"
 			},
 			"FSDinterdictor_LongRange": {
@@ -19500,6 +19597,10 @@
 					}
 				},
 				"id": 29,
+				"modulename": [
+					"Frame shift drive interdictor",
+					"FSDI"
+				],
 				"name": "Long range"
 			},
 			"FuelScoop_Shielded": {
@@ -19571,6 +19672,9 @@
 					}
 				},
 				"id": 30,
+				"modulename": [
+					"Fuel scoop"
+				],
 				"name": "Shielded"
 			},
 			"FuelTransferLimpet_LightWeight": {
@@ -19659,6 +19763,9 @@
 					}
 				},
 				"id": 31,
+				"modulename": [
+					"Fuel transfer limpet controller"
+				],
 				"name": "Lightweight"
 			},
 			"FuelTransferLimpet_Reinforced": {
@@ -19747,6 +19854,9 @@
 					}
 				},
 				"id": 32,
+				"modulename": [
+					"Fuel transfer limpet controller"
+				],
 				"name": "Reinforced"
 			},
 			"FuelTransferLimpet_Shielded": {
@@ -19835,6 +19945,9 @@
 					}
 				},
 				"id": 33,
+				"modulename": [
+					"Fuel transfer limpet controller"
+				],
 				"name": "Shielded"
 			},
 			"HatchBreakerLimpet_LightWeight": {
@@ -19923,6 +20036,9 @@
 					}
 				},
 				"id": 34,
+				"modulename": [
+					"Hatch breaker limpet controller"
+				],
 				"name": "Lightweight"
 			},
 			"HatchBreakerLimpet_Reinforced": {
@@ -20011,6 +20127,9 @@
 					}
 				},
 				"id": 35,
+				"modulename": [
+					"Hatch breaker limpet controller"
+				],
 				"name": "Reinforced"
 			},
 			"HatchBreakerLimpet_Shielded": {
@@ -20099,6 +20218,9 @@
 					}
 				},
 				"id": 36,
+				"modulename": [
+					"Hatch breaker limpet controller"
+				],
 				"name": "Shielded"
 			},
 			"HeatSinkLauncher_HeatSinkCapacity": {
@@ -20126,6 +20248,9 @@
 					}
 				},
 				"id": 37,
+				"modulename": [
+					"Heat sink launcher"
+				],
 				"name": "Ammo capacity"
 			},
 			"HeatSinkLauncher_LightWeight": {
@@ -20214,6 +20339,9 @@
 					}
 				},
 				"id": 38,
+				"modulename": [
+					"Heat sink launcher"
+				],
 				"name": "Lightweight"
 			},
 			"HeatSinkLauncher_Reinforced": {
@@ -20302,6 +20430,9 @@
 					}
 				},
 				"id": 39,
+				"modulename": [
+					"Heat sink launcher"
+				],
 				"name": "Reinforced"
 			},
 			"HeatSinkLauncher_Shielded": {
@@ -20390,6 +20521,9 @@
 					}
 				},
 				"id": 40,
+				"modulename": [
+					"Heat sink launcher"
+				],
 				"name": "Shielded"
 			},
 			"HullReinforcement_Advanced": {
@@ -20498,6 +20632,11 @@
 					}
 				},
 				"id": 41,
+				"modulename": [
+					"Hull reinforcement",
+					"Hull reinforcement package",
+					"HRP"
+				],
 				"name": "Lightweight"
 			},
 			"HullReinforcement_Explosive": {
@@ -20606,6 +20745,11 @@
 					}
 				},
 				"id": 43,
+				"modulename": [
+					"Hull reinforcement",
+					"Hull reinforcement package",
+					"HRP"
+				],
 				"name": "Blast resistant"
 			},
 			"HullReinforcement_HeavyDuty": {
@@ -20754,6 +20898,11 @@
 					}
 				},
 				"id": 42,
+				"modulename": [
+					"Hull reinforcement",
+					"Hull reinforcement package",
+					"HRP"
+				],
 				"name": "Heavy duty"
 			},
 			"HullReinforcement_Kinetic": {
@@ -20862,6 +21011,11 @@
 					}
 				},
 				"id": 44,
+				"modulename": [
+					"Hull reinforcement",
+					"Hull reinforcement package",
+					"HRP"
+				],
 				"name": "Kinetic resistant"
 			},
 			"HullReinforcement_Thermic": {
@@ -20970,6 +21124,11 @@
 					}
 				},
 				"id": 45,
+				"modulename": [
+					"Hull reinforcement",
+					"Hull reinforcement package",
+					"HRP"
+				],
 				"name": "Thermal resistant"
 			},
 			"KillWarrantScanner_LightWeight": {
@@ -21058,6 +21217,10 @@
 					}
 				},
 				"id": 46,
+				"modulename": [
+					"Kill warrant scanner",
+					"KWS"
+				],
 				"name": "Lightweight"
 			},
 			"KillWarrantScanner_LongRange": {
@@ -21166,6 +21329,10 @@
 					}
 				},
 				"id": 99,
+				"modulename": [
+					"Kill warrant scanner",
+					"KWS"
+				],
 				"name": "Long range"
 			},
 			"KillWarrantScanner_Reinforced": {
@@ -21254,6 +21421,10 @@
 					}
 				},
 				"id": 47,
+				"modulename": [
+					"Kill warrant scanner",
+					"KWS"
+				],
 				"name": "Reinforced"
 			},
 			"KillWarrantScanner_Shielded": {
@@ -21342,6 +21513,10 @@
 					}
 				},
 				"id": 48,
+				"modulename": [
+					"Kill warrant scanner",
+					"KWS"
+				],
 				"name": "Shielded"
 			},
 			"LifeSupport_LightWeight": {
@@ -21413,6 +21588,9 @@
 					}
 				},
 				"id": 49,
+				"modulename": [
+					"Life support"
+				],
 				"name": "Lightweight"
 			},
 			"LifeSupport_Reinforced": {
@@ -21484,6 +21662,9 @@
 					}
 				},
 				"id": 50,
+				"modulename": [
+					"Life support"
+				],
 				"name": "Reinforced"
 			},
 			"LifeSupport_Shielded": {
@@ -21555,6 +21736,9 @@
 					}
 				},
 				"id": 51,
+				"modulename": [
+					"Life support"
+				],
 				"name": "Shielded"
 			},
 			"PointDefence_LightWeight": {
@@ -21643,6 +21827,9 @@
 					}
 				},
 				"id": 52,
+				"modulename": [
+					"Point defence"
+				],
 				"name": "Lightweight"
 			},
 			"PointDefence_PointDefenseCapacity": {
@@ -21670,6 +21857,9 @@
 					}
 				},
 				"id": 55,
+				"modulename": [
+					"Point defence"
+				],
 				"name": "Ammo capacity"
 			},
 			"PointDefence_Reinforced": {
@@ -21758,6 +21948,9 @@
 					}
 				},
 				"id": 53,
+				"modulename": [
+					"Point defence"
+				],
 				"name": "Reinforced"
 			},
 			"PointDefence_Shielded": {
@@ -21846,6 +22039,9 @@
 					}
 				},
 				"id": 54,
+				"modulename": [
+					"Point defence"
+				],
 				"name": "Shielded"
 			},
 			"PowerDistributor_HighCapacity": {
@@ -22014,6 +22210,10 @@
 					}
 				},
 				"id": 56,
+				"modulename": [
+					"Power distributor",
+					"Distributor"
+				],
 				"name": "High charge capacity"
 			},
 			"PowerDistributor_HighFrequency": {
@@ -22182,6 +22382,10 @@
 					}
 				},
 				"id": 57,
+				"modulename": [
+					"Power distributor",
+					"Distributor"
+				],
 				"name": "Charge enhanced"
 			},
 			"PowerDistributor_PriorityEngines": {
@@ -22284,6 +22488,10 @@
 					}
 				},
 				"id": 58,
+				"modulename": [
+					"Power distributor",
+					"Distributor"
+				],
 				"name": "Engine focused"
 			},
 			"PowerDistributor_PrioritySystems": {
@@ -22386,6 +22594,10 @@
 					}
 				},
 				"id": 59,
+				"modulename": [
+					"Power distributor",
+					"Distributor"
+				],
 				"name": "System focused"
 			},
 			"PowerDistributor_PriorityWeapons": {
@@ -22488,6 +22700,10 @@
 					}
 				},
 				"id": 60,
+				"modulename": [
+					"Power distributor",
+					"Distributor"
+				],
 				"name": "Weapon focused"
 			},
 			"PowerDistributor_Shielded": {
@@ -22576,6 +22792,10 @@
 					}
 				},
 				"id": 61,
+				"modulename": [
+					"Power distributor",
+					"Distributor"
+				],
 				"name": "Shielded"
 			},
 			"PowerPlant_Armoured": {
@@ -22684,6 +22904,10 @@
 					}
 				},
 				"id": 62,
+				"modulename": [
+					"Power distributor",
+					"Distributor"
+				],
 				"name": "Armoured"
 			},
 			"PowerPlant_Boosted": {
@@ -22792,6 +23016,10 @@
 					}
 				},
 				"id": 63,
+				"modulename": [
+					"Power distributor",
+					"Distributor"
+				],
 				"name": "Overcharged"
 			},
 			"PowerPlant_Stealth": {
@@ -22858,6 +23086,10 @@
 					}
 				},
 				"id": 64,
+				"modulename": [
+					"Power distributor",
+					"Distributor"
+				],
 				"name": "Low emissions"
 			},
 			"ProspectingLimpet_LightWeight": {
@@ -22946,6 +23178,9 @@
 					}
 				},
 				"id": 65,
+				"modulename": [
+					"Prospector limpet controller"
+				],
 				"name": "Lightweight"
 			},
 			"ProspectingLimpet_Reinforced": {
@@ -23034,6 +23269,9 @@
 					}
 				},
 				"id": 66,
+				"modulename": [
+					"Prospector limpet controller"
+				],
 				"name": "Reinforced"
 			},
 			"ProspectingLimpet_Shielded": {
@@ -23122,6 +23360,9 @@
 					}
 				},
 				"id": 67,
+				"modulename": [
+					"Prospector limpet controller"
+				],
 				"name": "Shielded"
 			},
 			"Refineries_Shielded": {
@@ -23193,6 +23434,9 @@
 					}
 				},
 				"id": 92,
+				"modulename": [
+					"Refinery"
+				],
 				"name": "Shielded"
 			},
 			"Sensor_CargoScanner_FastScan": {
@@ -23301,6 +23545,10 @@
 					}
 				},
 				"id": 102,
+				"modulename": [
+					"Cargo scanner",
+					"Manifest scanner"
+				],
 				"name": "Fast scan"
 			},
 			"Sensor_CargoScanner_LongRange": {
@@ -23409,6 +23657,10 @@
 					}
 				},
 				"id": 104,
+				"modulename": [
+					"Cargo scanner",
+					"Manifest scanner"
+				],
 				"name": "Long range"
 			},
 			"Sensor_CargoScanner_WideAngle": {
@@ -23517,6 +23769,10 @@
 					}
 				},
 				"id": 105,
+				"modulename": [
+					"Cargo scanner",
+					"Manifest scanner"
+				],
 				"name": "Wide angle"
 			},
 			"Sensor_KillWarrantScanner_FastScan": {
@@ -23625,6 +23881,10 @@
 					}
 				},
 				"id": 101,
+				"modulename": [
+					"Kill warrant scanner",
+					"KWS"
+				],
 				"name": "Fast scan"
 			},
 			"Sensor_KillWarrantScanner_WideAngle": {
@@ -23733,6 +23993,10 @@
 					}
 				},
 				"id": 107,
+				"modulename": [
+					"Kill warrant scanner",
+					"KWS"
+				],
 				"name": "Wide angle"
 			},
 			"Sensor_Sensor_LightWeight": {
@@ -23841,6 +24105,9 @@
 					}
 				},
 				"id": 96,
+				"modulename": [
+					"Sensors"
+				],
 				"name": "Lightweight"
 			},
 			"Sensor_Sensor_LongRange": {
@@ -23949,6 +24216,9 @@
 					}
 				},
 				"id": 97,
+				"modulename": [
+					"Sensors"
+				],
 				"name": "Long range"
 			},
 			"Sensor_Sensor_WideAngle": {
@@ -24057,6 +24327,9 @@
 					}
 				},
 				"id": 98,
+				"modulename": [
+					"Sensors"
+				],
 				"name": "Wide angle"
 			},
 			"Sensor_SurfaceScanner_FastScan": {
@@ -24165,6 +24438,10 @@
 					}
 				},
 				"id": 95,
+				"modulename": [
+					"Detailed surface scanner",
+					"DSS"
+				],
 				"name": "Fast scan"
 			},
 			"Sensor_SurfaceScanner_LongRange": {
@@ -24273,6 +24550,10 @@
 					}
 				},
 				"id": 93,
+				"modulename": [
+					"Detailed surface scanner",
+					"DSS"
+				],
 				"name": "Long range"
 			},
 			"Sensor_SurfaceScanner_WideAngle": {
@@ -24381,6 +24662,10 @@
 					}
 				},
 				"id": 94,
+				"modulename": [
+					"Detailed surface scanner",
+					"DSS"
+				],
 				"name": "Wide angle"
 			},
 			"Sensor_WakeScanner_FastScan": {
@@ -24489,6 +24774,10 @@
 					}
 				},
 				"id": 109,
+				"modulename": [
+					"Wake scanner",
+					"Frame shift wake scanner"
+				],
 				"name": "Fast scan"
 			},
 			"Sensor_WakeScanner_LongRange": {
@@ -24597,6 +24886,10 @@
 					}
 				},
 				"id": 108,
+				"modulename": [
+					"Wake scanner",
+					"Frame shift wake scanner"
+				],
 				"name": "Long range"
 			},
 			"Sensor_WakeScanner_WideAngle": {
@@ -24705,6 +24998,10 @@
 					}
 				},
 				"id": 106,
+				"modulename": [
+					"Wake scanner",
+					"Frame shift wake scanner"
+				],
 				"name": "Wide angle"
 			},
 			"ShieldBooster_Explosive": {
@@ -24813,6 +25110,9 @@
 					}
 				},
 				"id": 68,
+				"modulename": [
+					"Shield booster"
+				],
 				"name": "Blast resistant"
 			},
 			"ShieldBooster_HeavyDuty": {
@@ -24941,6 +25241,9 @@
 					}
 				},
 				"id": 69,
+				"modulename": [
+					"Shield booster"
+				],
 				"name": "Heavy duty"
 			},
 			"ShieldBooster_Kinetic": {
@@ -25049,6 +25352,9 @@
 					}
 				},
 				"id": 70,
+				"modulename": [
+					"Shield booster"
+				],
 				"name": "Kinetic resistant"
 			},
 			"ShieldBooster_Resistive": {
@@ -25197,6 +25503,9 @@
 					}
 				},
 				"id": 71,
+				"modulename": [
+					"Shield booster"
+				],
 				"name": "Resistance augmented"
 			},
 			"ShieldBooster_Thermic": {
@@ -25305,6 +25614,9 @@
 					}
 				},
 				"id": 72,
+				"modulename": [
+					"Shield booster"
+				],
 				"name": "Thermal resistant"
 			},
 			"ShieldCellBank_Rapid": {
@@ -25383,6 +25695,10 @@
 					}
 				},
 				"id": 73,
+				"modulename": [
+					"Shield cell bank",
+					"SCB"
+				],
 				"name": "Rapid charge"
 			},
 			"ShieldCellBank_Specialised": {
@@ -25461,6 +25777,10 @@
 					}
 				},
 				"id": 74,
+				"modulename": [
+					"Shield cell bank",
+					"SCB"
+				],
 				"name": "Specialised"
 			},
 			"ShieldGenerator_Kinetic": {
@@ -25569,6 +25889,10 @@
 					}
 				},
 				"id": 75,
+				"modulename": [
+					"Shield generator",
+					"Shields"
+				],
 				"name": "Kinetic resistant"
 			},
 			"ShieldGenerator_Optimised": {
@@ -25709,6 +26033,10 @@
 					}
 				},
 				"id": 76,
+				"modulename": [
+					"Shield generator",
+					"Shields"
+				],
 				"name": "Enhanced low power"
 			},
 			"ShieldGenerator_Reinforced": {
@@ -25885,6 +26213,10 @@
 					}
 				},
 				"id": 77,
+				"modulename": [
+					"Shield generator",
+					"Shields"
+				],
 				"name": "Reinforced"
 			},
 			"ShieldGenerator_Thermic": {
@@ -25993,6 +26325,10 @@
 					}
 				},
 				"id": 78,
+				"modulename": [
+					"Shield generator",
+					"Shields"
+				],
 				"name": "Thermal resistant"
 			},
 			"WakeScanner_LightWeight": {
@@ -26081,6 +26417,10 @@
 					}
 				},
 				"id": 79,
+				"modulename": [
+					"Frame shift wake scanner",
+					"Wake scanner"
+				],
 				"name": "Lightweight"
 			},
 			"WakeScanner_Reinforced": {
@@ -26169,6 +26509,10 @@
 					}
 				},
 				"id": 81,
+				"modulename": [
+					"Frame shift wake scanner",
+					"Wake scanner"
+				],
 				"name": "Reinforced"
 			},
 			"WakeScanner_Shielded": {
@@ -26257,6 +26601,10 @@
 					}
 				},
 				"id": 80,
+				"modulename": [
+					"Frame shift wake scanner",
+					"Wake scanner"
+				],
 				"name": "Shielded"
 			},
 			"Weapon_DoubleShot": {
@@ -26385,6 +26733,9 @@
 					}
 				},
 				"id": 82,
+				"modulename": [
+					"Weapon"
+				],
 				"name": "Double shot"
 			},
 			"Weapon_Efficient": {
@@ -26501,6 +26852,9 @@
 					}
 				},
 				"id": 83,
+				"modulename": [
+					"Weapon"
+				],
 				"name": "Efficient"
 			},
 			"Weapon_Focused": {
@@ -26625,6 +26979,9 @@
 					}
 				},
 				"id": 84,
+				"modulename": [
+					"Weapon"
+				],
 				"name": "Focused"
 			},
 			"Weapon_HighCapacity": {
@@ -26773,6 +27130,9 @@
 					}
 				},
 				"id": 85,
+				"modulename": [
+					"Weapon"
+				],
 				"name": "High capacity"
 			},
 			"Weapon_LightWeight": {
@@ -26901,6 +27261,9 @@
 					}
 				},
 				"id": 86,
+				"modulename": [
+					"Weapon"
+				],
 				"name": "Lightweight"
 			},
 			"Weapon_LongRange": {
@@ -27025,6 +27388,9 @@
 					}
 				},
 				"id": 87,
+				"modulename": [
+					"Weapon"
+				],
 				"name": "Long range"
 			},
 			"Weapon_Overcharged": {
@@ -27161,6 +27527,9 @@
 					}
 				},
 				"id": 88,
+				"modulename": [
+					"Weapon"
+				],
 				"name": "Overcharged"
 			},
 			"Weapon_RapidFire": {
@@ -27305,6 +27674,9 @@
 					}
 				},
 				"id": 89,
+				"modulename": [
+					"Weapon"
+				],
 				"name": "Rapid fire"
 			},
 			"Weapon_ShortRange": {
@@ -27421,6 +27793,9 @@
 					}
 				},
 				"id": 90,
+				"modulename": [
+					"Weapon"
+				],
 				"name": "Short range"
 			},
 			"Weapon_Sturdy": {
@@ -27541,6 +27916,9 @@
 					}
 				},
 				"id": 91,
+				"modulename": [
+					"Weapon"
+				],
 				"name": "Sturdy"
 			}
 		},
diff --git a/modifications/blueprints.json b/modifications/blueprints.json
index 5490521..7157205 100644
--- a/modifications/blueprints.json
+++ b/modifications/blueprints.json
@@ -44,6 +44,7 @@
       }
     },
     "id": 3,
+    "modulename": ["Auto field mainentance unit", "AFMU"],
     "name": "Shielded"
   },
   "Armour_Advanced": {
@@ -117,6 +118,7 @@
       }
     },
     "id": 6,
+    "modulename": ["Bulkheads", "Armour"],
     "name": "Lightweight"
   },
   "Armour_Explosive": {
@@ -179,6 +181,7 @@
       }
     },
     "id": 5,
+    "modulename": ["Bulkheads", "Armour"],
     "name": "Blast resistant"
   },
   "Armour_HeavyDuty": {
@@ -252,6 +255,7 @@
       }
     },
     "id": 7,
+    "modulename": ["Bulkheads", "Armour"],
     "name": "Heavy duty"
   },
   "Armour_Kinetic": {
@@ -315,6 +319,7 @@
       }
     },
     "id": 4,
+    "modulename": ["Bulkheads", "Armour"],
     "name": "Kinetic resistant"
   },
   "Armour_Thermic": {
@@ -370,6 +375,7 @@
       }
     },
     "id": 8,
+    "modulename": ["Bulkheads", "Armour"],
     "name": "Thermal resistant"
   },
   "CargoScanner_LightWeight": {
@@ -428,6 +434,7 @@
       }
     },
     "id": 9,
+    "modulename": ["Cargo scanner", "Manifest scanner"],
     "name": "Lightweight"
   },
   "CargoScanner_Reinforced": {
@@ -486,6 +493,7 @@
       }
     },
     "id": 10,
+    "modulename": ["Cargo scanner", "Manifest scanner"],
     "name": "Reinforced"
   },
   "CargoScanner_Shielded": {
@@ -544,6 +552,7 @@
       }
     },
     "id": 11,
+    "modulename": ["Cargo scanner", "Manifest scanner"],
     "name": "Shielded"
   },
   "ChaffLauncher_ChaffCapacity": {
@@ -562,6 +571,7 @@
       }
     },
     "id": 12,
+    "modulename": ["Chaff launcher"],
     "name": "Ammo capacity"
   },
   "ChaffLauncher_LightWeight": {
@@ -620,6 +630,7 @@
       }
     },
     "id": 13,
+    "modulename": ["Chaff launcher"],
     "name": "Lightweight"
   },
   "ChaffLauncher_Reinforced": {
@@ -678,6 +689,7 @@
       }
     },
     "id": 14,
+    "modulename": ["Chaff launcher"],
     "name": "Reinforced"
   },
   "ChaffLauncher_Shielded": {
@@ -736,6 +748,7 @@
       }
     },
     "id": 15,
+    "modulename": ["Chaff launcher"],
     "name": "Shielded"
   },
   "CollectionLimpet_LightWeight": {
@@ -794,6 +807,7 @@
       }
     },
     "id": 16,
+    "modulename": ["Collector limpet controller"],
     "name": "Lightweight"
   },
   "CollectionLimpet_Reinforced": {
@@ -852,6 +866,7 @@
       }
     },
     "id": 17,
+    "modulename": ["Collector limpet controller"],
     "name": "Reinforced"
   },
   "CollectionLimpet_Shielded": {
@@ -910,6 +925,7 @@
       }
     },
     "id": 18,
+    "modulename": ["Collector limpet controller"],
     "name": "Shielded"
   },
   "ECM_LightWeight": {
@@ -968,6 +984,7 @@
       }
     },
     "id": 19,
+    "modulename": ["Electronic counter measures", "ECM"],
     "name": "Lightweight"
   },
   "ECM_Reinforced": {
@@ -1026,6 +1043,7 @@
       }
     },
     "id": 20,
+    "modulename": ["Electronic counter measures", "ECM"],
     "name": "Reinforced"
   },
   "ECM_Shielded": {
@@ -1084,6 +1102,7 @@
       }
     },
     "id": 21,
+    "modulename": ["Electronic counter measures", "ECM"],
     "name": "Shielded"
   },
   "Engine_Dirty": {
@@ -1157,6 +1176,7 @@
       }
     },
     "id": 22,
+    "modulename": ["Thrusters", "Engines"],
     "name": "Dirty"
   },
   "Engine_Reinforced": {
@@ -1225,6 +1245,7 @@
       }
     },
     "id": 23,
+    "modulename": ["Thrusters", "Engines"],
     "name": "Reinforced"
   },
   "Engine_Tuned": {
@@ -1298,6 +1319,7 @@
       }
     },
     "id": 24,
+    "modulename": ["Thrusters", "Engines"],
     "name": "Clean"
   },
   "FSD_FastBoot": {
@@ -1366,6 +1388,7 @@
       }
     },
     "id": 25,
+    "modulename": ["Frame shift drive", "FSD"],
     "name": "Faster boot sequence"
   },
   "FSD_LongRange": {
@@ -1434,6 +1457,7 @@
       }
     },
     "id": 26,
+    "modulename": ["Frame shift drive", "FSD"],
     "name": "Increased range"
   },
   "FSD_Shielded": {
@@ -1502,6 +1526,7 @@
       }
     },
     "id": 27,
+    "modulename": ["Frame shift drive", "FSD"],
     "name": "Shielded"
   },
   "FSDinterdictor_Expanded": {
@@ -1553,6 +1578,7 @@
       }
     },
     "id": 28,
+    "modulename": ["Frame shift drive interdictor", "FSDI"],
     "name": "Expanded capture arc"
   },
   "FSDinterdictor_LongRange": {
@@ -1595,6 +1621,7 @@
       }
     },
     "id": 29,
+    "modulename": ["Frame shift drive interdictor", "FSDI"],
     "name": "Long range"
   },
   "FuelScoop_Shielded": {
@@ -1642,6 +1669,7 @@
       }
     },
     "id": 30,
+    "modulename": ["Fuel scoop"],
     "name": "Shielded"
   },
   "FuelTransferLimpet_LightWeight": {
@@ -1700,6 +1728,7 @@
       }
     },
     "id": 31,
+    "modulename": ["Fuel transfer limpet controller"],
     "name": "Lightweight"
   },
   "FuelTransferLimpet_Reinforced": {
@@ -1758,6 +1787,7 @@
       }
     },
     "id": 32,
+    "modulename": ["Fuel transfer limpet controller"],
     "name": "Reinforced"
   },
   "FuelTransferLimpet_Shielded": {
@@ -1816,6 +1846,7 @@
       }
     },
     "id": 33,
+    "modulename": ["Fuel transfer limpet controller"],
     "name": "Shielded"
   },
   "HatchBreakerLimpet_LightWeight": {
@@ -1874,6 +1905,7 @@
       }
     },
     "id": 34,
+    "modulename": ["Hatch breaker limpet controller"],
     "name": "Lightweight"
   },
   "HatchBreakerLimpet_Reinforced": {
@@ -1932,6 +1964,7 @@
       }
     },
     "id": 35,
+    "modulename": ["Hatch breaker limpet controller"],
     "name": "Reinforced"
   },
   "HatchBreakerLimpet_Shielded": {
@@ -1990,6 +2023,7 @@
       }
     },
     "id": 36,
+    "modulename": ["Hatch breaker limpet controller"],
     "name": "Shielded"
   },
   "HeatSinkLauncher_HeatSinkCapacity": {
@@ -2008,6 +2042,7 @@
       }
     },
     "id": 37,
+    "modulename": ["Heat sink launcher"],
     "name": "Ammo capacity"
   },
   "HeatSinkLauncher_LightWeight": {
@@ -2066,6 +2101,7 @@
       }
     },
     "id": 38,
+    "modulename": ["Heat sink launcher"],
     "name": "Lightweight"
   },
   "HeatSinkLauncher_Reinforced": {
@@ -2124,6 +2160,7 @@
       }
     },
     "id": 39,
+    "modulename": ["Heat sink launcher"],
     "name": "Reinforced"
   },
   "HeatSinkLauncher_Shielded": {
@@ -2182,6 +2219,7 @@
       }
     },
     "id": 40,
+    "modulename": ["Heat sink launcher"],
     "name": "Shielded"
   },
   "HullReinforcement_Advanced": {
@@ -2245,6 +2283,7 @@
       }
     },
     "id": 41,
+    "modulename": ["Hull reinforcement", "Hull reinforcement package", "HRP"],
     "name": "Lightweight"
   },
   "HullReinforcement_Explosive": {
@@ -2308,6 +2347,7 @@
       }
     },
     "id": 43,
+    "modulename": ["Hull reinforcement", "Hull reinforcement package", "HRP"],
     "name": "Blast resistant"
   },
   "HullReinforcement_HeavyDuty": {
@@ -2381,6 +2421,7 @@
       }
     },
     "id": 42,
+    "modulename": ["Hull reinforcement", "Hull reinforcement package", "HRP"],
     "name": "Heavy duty"
   },
   "HullReinforcement_Kinetic": {
@@ -2444,6 +2485,7 @@
       }
     },
     "id": 44,
+    "modulename": ["Hull reinforcement", "Hull reinforcement package", "HRP"],
     "name": "Kinetic resistant"
   },
   "HullReinforcement_Thermic": {
@@ -2507,6 +2549,7 @@
       }
     },
     "id": 45,
+    "modulename": ["Hull reinforcement", "Hull reinforcement package", "HRP"],
     "name": "Thermal resistant"
   },
   "KillWarrantScanner_LightWeight": {
@@ -2565,6 +2608,7 @@
       }
     },
     "id": 46,
+    "modulename": ["Kill warrant scanner", "KWS"],
     "name": "Lightweight"
   },
   "KillWarrantScanner_LongRange": {
@@ -2628,6 +2672,7 @@
       }
     },
     "id": 99,
+    "modulename": ["Kill warrant scanner", "KWS"],
     "name": "Long range"
   },
   "KillWarrantScanner_Reinforced": {
@@ -2686,6 +2731,7 @@
       }
     },
     "id": 47,
+    "modulename": ["Kill warrant scanner", "KWS"],
     "name": "Reinforced"
   },
   "KillWarrantScanner_Shielded": {
@@ -2744,6 +2790,7 @@
       }
     },
     "id": 48,
+    "modulename": ["Kill warrant scanner", "KWS"],
     "name": "Shielded"
   },
   "LifeSupport_LightWeight": {
@@ -2791,6 +2838,7 @@
       }
     },
     "id": 49,
+    "modulename": ["Life support"],
     "name": "Lightweight"
   },
   "LifeSupport_Reinforced": {
@@ -2838,6 +2886,7 @@
       }
     },
     "id": 50,
+    "modulename": ["Life support"],
     "name": "Reinforced"
   },
   "LifeSupport_Shielded": {
@@ -2885,6 +2934,7 @@
       }
     },
     "id": 51,
+    "modulename": ["Life support"],
     "name": "Shielded"
   },
   "PointDefence_LightWeight": {
@@ -2943,6 +2993,7 @@
       }
     },
     "id": 52,
+    "modulename": ["Point defence"],
     "name": "Lightweight"
   },
   "PointDefence_PointDefenseCapacity": {
@@ -2961,6 +3012,7 @@
       }
     },
     "id": 55,
+    "modulename": ["Point defence"],
     "name": "Ammo capacity"
   },
   "PointDefence_Reinforced": {
@@ -3019,6 +3071,7 @@
       }
     },
     "id": 53,
+    "modulename": ["Point defence"],
     "name": "Reinforced"
   },
   "PointDefence_Shielded": {
@@ -3077,6 +3130,7 @@
       }
     },
     "id": 54,
+    "modulename": ["Point defence"],
     "name": "Shielded"
   },
   "PowerDistributor_HighCapacity": {
@@ -3155,6 +3209,7 @@
       }
     },
     "id": 56,
+    "modulename": ["Power distributor", "Distributor"],
     "name": "High charge capacity"
   },
   "PowerDistributor_HighFrequency": {
@@ -3233,6 +3288,7 @@
       }
     },
     "id": 57,
+    "modulename": ["Power distributor", "Distributor"],
     "name": "Charge enhanced"
   },
   "PowerDistributor_PriorityEngines": {
@@ -3281,6 +3337,7 @@
       }
     },
     "id": 58,
+    "modulename": ["Power distributor", "Distributor"],
     "name": "Engine focused"
   },
   "PowerDistributor_PrioritySystems": {
@@ -3329,6 +3386,7 @@
       }
     },
     "id": 59,
+    "modulename": ["Power distributor", "Distributor"],
     "name": "System focused"
   },
   "PowerDistributor_PriorityWeapons": {
@@ -3377,6 +3435,7 @@
       }
     },
     "id": 60,
+    "modulename": ["Power distributor", "Distributor"],
     "name": "Weapon focused"
   },
   "PowerDistributor_Shielded": {
@@ -3435,6 +3494,7 @@
       }
     },
     "id": 61,
+    "modulename": ["Power distributor", "Distributor"],
     "name": "Shielded"
   },
   "PowerPlant_Armoured": {
@@ -3498,6 +3558,7 @@
       }
     },
     "id": 62,
+    "modulename": ["Power distributor", "Distributor"],
     "name": "Armoured"
   },
   "PowerPlant_Boosted": {
@@ -3561,6 +3622,7 @@
       }
     },
     "id": 63,
+    "modulename": ["Power distributor", "Distributor"],
     "name": "Overcharged"
   },
   "PowerPlant_Stealth": {
@@ -3600,6 +3662,7 @@
       }
     },
     "id": 64,
+    "modulename": ["Power distributor", "Distributor"],
     "name": "Low emissions"
   },
   "ProspectingLimpet_LightWeight": {
@@ -3658,6 +3721,7 @@
       }
     },
     "id": 65,
+    "modulename": ["Prospector limpet controller"],
     "name": "Lightweight"
   },
   "ProspectingLimpet_Reinforced": {
@@ -3716,6 +3780,7 @@
       }
     },
     "id": 66,
+    "modulename": ["Prospector limpet controller"],
     "name": "Reinforced"
   },
   "ProspectingLimpet_Shielded": {
@@ -3774,6 +3839,7 @@
       }
     },
     "id": 67,
+    "modulename": ["Prospector limpet controller"],
     "name": "Shielded"
   },
   "Refineries_Shielded": {
@@ -3821,6 +3887,7 @@
       }
     },
     "id": 92,
+    "modulename": ["Refinery"],
     "name": "Shielded"
   },
   "Sensor_CargoScanner_FastScan": {
@@ -3884,6 +3951,7 @@
       }
     },
     "id": 102,
+    "modulename": ["Cargo scanner", "Manifest scanner"],
     "name": "Fast scan"
   },
   "Sensor_CargoScanner_LongRange": {
@@ -3947,6 +4015,7 @@
       }
     },
     "id": 104,
+    "modulename": ["Cargo scanner", "Manifest scanner"],
     "name": "Long range"
   },
   "Sensor_CargoScanner_WideAngle": {
@@ -4010,6 +4079,7 @@
       }
     },
     "id": 105,
+    "modulename": ["Cargo scanner", "Manifest scanner"],
     "name": "Wide angle"
   },
   "Sensor_KillWarrantScanner_FastScan": {
@@ -4073,6 +4143,7 @@
       }
     },
     "id": 101,
+    "modulename": ["Kill warrant scanner", "KWS"],
     "name": "Fast scan"
   },
   "Sensor_KillWarrantScanner_WideAngle": {
@@ -4136,6 +4207,7 @@
       }
     },
     "id": 107,
+    "modulename": ["Kill warrant scanner", "KWS"],
     "name": "Wide angle"
   },
   "Sensor_Sensor_LightWeight": {
@@ -4199,6 +4271,7 @@
       }
     },
     "id": 96,
+    "modulename": ["Sensors"],
     "name": "Lightweight"
   },
   "Sensor_Sensor_LongRange": {
@@ -4262,6 +4335,7 @@
       }
     },
     "id": 97,
+    "modulename": ["Sensors"],
     "name": "Long range"
   },
   "Sensor_Sensor_WideAngle": {
@@ -4325,6 +4399,7 @@
       }
     },
     "id": 98,
+    "modulename": ["Sensors"],
     "name": "Wide angle"
   },
   "Sensor_SurfaceScanner_FastScan": {
@@ -4388,6 +4463,7 @@
       }
     },
     "id": 95,
+    "modulename": ["Detailed surface scanner", "DSS"],
     "name": "Fast scan"
   },
   "Sensor_SurfaceScanner_LongRange": {
@@ -4451,6 +4527,7 @@
       }
     },
     "id": 93,
+    "modulename": ["Detailed surface scanner", "DSS"],
     "name": "Long range"
   },
   "Sensor_SurfaceScanner_WideAngle": {
@@ -4514,6 +4591,7 @@
       }
     },
     "id": 94,
+    "modulename": ["Detailed surface scanner", "DSS"],
     "name": "Wide angle"
   },
   "Sensor_WakeScanner_FastScan": {
@@ -4577,6 +4655,7 @@
       }
     },
     "id": 109,
+    "modulename": ["Wake scanner", "Frame shift wake scanner"],
     "name": "Fast scan"
   },
   "Sensor_WakeScanner_LongRange": {
@@ -4640,6 +4719,7 @@
       }
     },
     "id": 108,
+    "modulename": ["Wake scanner", "Frame shift wake scanner"],
     "name": "Long range"
   },
   "Sensor_WakeScanner_WideAngle": {
@@ -4703,6 +4783,7 @@
       }
     },
     "id": 106,
+    "modulename": ["Wake scanner", "Frame shift wake scanner"],
     "name": "Wide angle"
   },
   "ShieldBooster_Explosive": {
@@ -4766,6 +4847,7 @@
       }
     },
     "id": 68,
+    "modulename": ["Shield booster"],
     "name": "Blast resistant"
   },
   "ShieldBooster_HeavyDuty": {
@@ -4834,6 +4916,7 @@
       }
     },
     "id": 69,
+    "modulename": ["Shield booster"],
     "name": "Heavy duty"
   },
   "ShieldBooster_Kinetic": {
@@ -4897,6 +4980,7 @@
       }
     },
     "id": 70,
+    "modulename": ["Shield booster"],
     "name": "Kinetic resistant"
   },
   "ShieldBooster_Resistive": {
@@ -4970,6 +5054,7 @@
       }
     },
     "id": 71,
+    "modulename": ["Shield booster"],
     "name": "Resistance augmented"
   },
   "ShieldBooster_Thermic": {
@@ -5033,6 +5118,7 @@
       }
     },
     "id": 72,
+    "modulename": ["Shield booster"],
     "name": "Thermal resistant"
   },
   "ShieldCellBank_Rapid": {
@@ -5075,6 +5161,7 @@
       }
     },
     "id": 73,
+    "modulename": ["Shield cell bank", "SCB"],
     "name": "Rapid charge"
   },
   "ShieldCellBank_Specialised": {
@@ -5117,6 +5204,7 @@
       }
     },
     "id": 74,
+    "modulename": ["Shield cell bank", "SCB"],
     "name": "Specialised"
   },
   "ShieldGenerator_Kinetic": {
@@ -5180,6 +5268,7 @@
       }
     },
     "id": 75,
+    "modulename": ["Shield generator", "Shields"],
     "name": "Kinetic resistant"
   },
   "ShieldGenerator_Optimised": {
@@ -5251,6 +5340,7 @@
       }
     },
     "id": 76,
+    "modulename": ["Shield generator", "Shields"],
     "name": "Enhanced low power"
   },
   "ShieldGenerator_Reinforced": {
@@ -5331,6 +5421,7 @@
       }
     },
     "id": 77,
+    "modulename": ["Shield generator", "Shields"],
     "name": "Reinforced"
   },
   "ShieldGenerator_Thermic": {
@@ -5394,6 +5485,7 @@
       }
     },
     "id": 78,
+    "modulename": ["Shield generator", "Shields"],
     "name": "Thermal resistant"
   },
   "WakeScanner_LightWeight": {
@@ -5452,6 +5544,7 @@
       }
     },
     "id": 79,
+    "modulename": ["Frame shift wake scanner", "Wake scanner"],
     "name": "Lightweight"
   },
   "WakeScanner_Reinforced": {
@@ -5510,6 +5603,7 @@
       }
     },
     "id": 81,
+    "modulename": ["Frame shift wake scanner", "Wake scanner"],
     "name": "Reinforced"
   },
   "WakeScanner_Shielded": {
@@ -5568,6 +5662,7 @@
       }
     },
     "id": 80,
+    "modulename": ["Frame shift wake scanner", "Wake scanner"],
     "name": "Shielded"
   },
   "Weapon_DoubleShot": {
@@ -5636,6 +5731,7 @@
       }
     },
     "id": 82,
+    "modulename": ["Weapon"],
     "name": "Double shot"
   },
   "Weapon_Efficient": {
@@ -5701,6 +5797,7 @@
       }
     },
     "id": 83,
+    "modulename": ["Weapon"],
     "name": "Efficient"
   },
   "Weapon_Focused": {
@@ -5768,6 +5865,7 @@
       }
     },
     "id": 84,
+    "modulename": ["Weapon"],
     "name": "Focused"
   },
   "Weapon_HighCapacity": {
@@ -5841,6 +5939,7 @@
       }
     },
     "id": 85,
+    "modulename": ["Weapon"],
     "name": "High capacity"
   },
   "Weapon_LightWeight": {
@@ -5909,6 +6008,7 @@
       }
     },
     "id": 86,
+    "modulename": ["Weapon"],
     "name": "Lightweight"
   },
   "Weapon_LongRange": {
@@ -5976,6 +6076,7 @@
       }
     },
     "id": 87,
+    "modulename": ["Weapon"],
     "name": "Long range"
   },
   "Weapon_Overcharged": {
@@ -6046,6 +6147,7 @@
       }
     },
     "id": 88,
+    "modulename": ["Weapon"],
     "name": "Overcharged"
   },
   "Weapon_RapidFire": {
@@ -6118,6 +6220,7 @@
       }
     },
     "id": 89,
+    "modulename": ["Weapon"],
     "name": "Rapid fire"
   },
   "Weapon_ShortRange": {
@@ -6183,6 +6286,7 @@
       }
     },
     "id": 90,
+    "modulename": ["Weapon"],
     "name": "Short range"
   },
   "Weapon_Sturdy": {
@@ -6249,6 +6353,7 @@
       }
     },
     "id": 91,
+    "modulename": ["Weapon"],
     "name": "Sturdy"
   }
 }