diff --git a/coriolis-data b/coriolis-data
index d4ffc020..648cd56e 160000
--- a/coriolis-data
+++ b/coriolis-data
@@ -1 +1 @@
-Subproject commit d4ffc0202a929d25eb2056b1af00030a59a4512a
+Subproject commit 648cd56e5e6833bde2da49f6bc259c578d6a37e9
diff --git a/coriolis.py b/coriolis.py
index 0e105c30..1ca9d333 100755
--- a/coriolis.py
+++ b/coriolis.py
@@ -252,7 +252,7 @@ if __name__ == "__main__":
         'Viper Mk IV'  : 'Viper MkIV',
     }
 
-    # From https://github.com/cmmcleod/coriolis/blob/master/src/app/shipyard/Constants.js
+    # From https://github.com/EDCD/coriolis/blob/master/src/app/shipyard/Constants.js
     ModuleGroupToName = {
         # Standard
         'pp'  : 'Power Plant',
@@ -281,6 +281,7 @@ if __name__ == "__main__":
         'psg' : 'Prismatic Shield Generator',
         'dc'  : 'Docking Computer',
         'fx'  : 'Fuel Transfer Limpet Controller',
+        'mrp' : 'Module Reinforcement Package',
         'pc'  : 'Prospector Limpet Controller',
         'pce' : 'Economy Class Passenger Cabin',
         'pci' : 'Business Class Passenger Cabin',
@@ -292,15 +293,19 @@ if __name__ == "__main__":
         'bl'  : 'Beam Laser',
         'ul'  : 'Burst Laser',
         'c'   : 'Cannon',
+        'ch'  : 'Chaff Launcher',
         'cs'  : 'Cargo Scanner',
         'cm'  : 'Countermeasure',
+        'ec'  : 'Electronic Countermeasure',
         'fc'  : 'Fragment Cannon',
+        'hs'  : 'Heat Sink Launcher',
         'ws'  : 'Frame Shift Wake Scanner',
         'kw'  : 'Kill Warrant Scanner',
         'nl'  : 'Mine Launcher',
         'ml'  : 'Mining Laser',
         'mr'  : 'Missile Rack',
         'pa'  : 'Plasma Accelerator',
+        'po'  : 'Point Defence',
         'mc'  : 'Multi-cannon',
         'pl'  : 'Pulse Laser',
         'rg'  : 'Rail Gun',
@@ -325,7 +330,7 @@ if __name__ == "__main__":
     for cat in data['Modules'].values():
         for grp, mlist in cat.iteritems():
             for m in mlist:
-                key = ('name' in m and specials[(ModuleGroupToName[grp], m['name'])] or specials.get((ModuleGroupToName[grp], None), ModuleGroupToName[grp]),
+                key = (specials.get((ModuleGroupToName[grp], m.get('name'))) or ModuleGroupToName[grp],
                        None,
                        str(m['class']),
                        str(m['rating']))
diff --git a/modules.p b/modules.p
index fcee20f4..ef7489dc 100644
Binary files a/modules.p and b/modules.p differ
diff --git a/ships.p b/ships.p
index bfda0d3b..d4f90a79 100644
--- a/ships.p
+++ b/ships.p
@@ -1,5 +1,5 @@
 €}q
(UFederal Assault Shipq}qUhullMassqMà
sU
 Viper MkIVq}qhK¾sUFederal Gunshipq}qhMDsUViper MkIIIq	}q
-hK<sUImperial Eagleq}qhK2sUImperial Cutterq
}qhMLsUEagleq}qhK2sUPythonq}qhM^
sUType-6 Transporterq}qhK›sUFer-de-Lanceq}qhKúsUVultureq}qhKæsUAdderq}qhK#sUBeluga Linerq}qhMLsUType-7 Transporterq}qhM¤
sUFederal Corvetteq}q hM„sUDiamondback Scoutq!}q"hKªsUAsp Explorerq#}q$hM
sUDiamondback Explorerq%}q&hM*
sUFederal Dropshipq'}q(hMDsUCobra MkIIIq)}q*hK´sUOrcaq+}q,hMDsU
+hK2sUImperial Eagleq}qhK2sUImperial Cutterq
}qhMLsUEagleq}qhK2sUPythonq}qhM^
sUType-6 Transporterq}qhK›sUFer-de-Lanceq}qhKúsUVultureq}qhKæsUAdderq}qhK#sUBeluga Linerq}qhMLsUType-7 Transporterq}qhM¤
sUFederal Corvetteq}q hM„sUDiamondback Scoutq!}q"hKªsUAsp Explorerq#}q$hM
sUDiamondback Explorerq%}q&hM*
sUFederal Dropshipq'}q(hMDsUCobra MkIIIq)}q*hK´sUOrcaq+}q,hMDsU
 Sidewinderq-}q.hKsUHaulerq/}q0hKsUType-9 Heavyq1}q2hMèsU
 Cobra MkIVq3}q4hKÒsUImperial Courierq5}q6hK#sUAnacondaq7}q8hM�
sUImperial Clipperq9}q:hM�
sUKeelbackq;}q<hK´sU	Asp Scoutq=}q>hK–su.
\ No newline at end of file