diff --git a/eos/effects/angelsetbonus.py b/eos/effects/angelsetbonus.py
index efd7edf5f..c83c91c86 100755
--- a/eos/effects/angelsetbonus.py
+++ b/eos/effects/angelsetbonus.py
@@ -1,6 +1,5 @@
 # Used by:
-# Implants named like: Halo (18 of 18)
-# Implants named like: Low grade Halo (12 of 12)
+# Implants named like: grade Halo (18 of 18)
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
diff --git a/eos/effects/basesensorstrengthmodifierrequiringastrometrics.py b/eos/effects/basesensorstrengthmodifierrequiringastrometrics.py
index 7e1b8ada0..6fe02512a 100755
--- a/eos/effects/basesensorstrengthmodifierrequiringastrometrics.py
+++ b/eos/effects/basesensorstrengthmodifierrequiringastrometrics.py
@@ -1,7 +1,7 @@
 # Used by:
 # Modules from group: Scan Probe Launcher (4 of 7)
-# Implants named like: Low grade Virtue (10 of 12)
 # Implants named like: Poteque 'Prospector' Astrometric Rangefinding AR (3 of 3)
+# Implants named like: grade Virtue (10 of 12)
 # Modules named like: Gravity Capacitor Upgrade (8 of 8)
 # Skill: Astrometric Rangefinding
 # Skill: Astrometrics
diff --git a/eos/effects/boostermodifyboosterarmorpenalties.py b/eos/effects/boostermodifyboosterarmorpenalties.py
index 56a188c01..b9a469b97 100755
--- a/eos/effects/boostermodifyboosterarmorpenalties.py
+++ b/eos/effects/boostermodifyboosterarmorpenalties.py
@@ -1,6 +1,6 @@
 # Used by:
 # Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
-# Implants named like: Low grade Edge (10 of 12)
+# Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"
 def handler(fit, container, context):
diff --git a/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py b/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py
index 37e5552c5..12f06c2bb 100755
--- a/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py
+++ b/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py
@@ -1,6 +1,6 @@
 # Used by:
 # Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
-# Implants named like: Low grade Edge (10 of 12)
+# Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"
 def handler(fit, container, context):
diff --git a/eos/effects/boostermodifyboostermissilepenalty.py b/eos/effects/boostermodifyboostermissilepenalty.py
index e7aaef2c8..6523d5c6f 100755
--- a/eos/effects/boostermodifyboostermissilepenalty.py
+++ b/eos/effects/boostermodifyboostermissilepenalty.py
@@ -1,6 +1,6 @@
 # Used by:
 # Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
-# Implants named like: Low grade Edge (10 of 12)
+# Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"
 def handler(fit, container, context):
diff --git a/eos/effects/boostermodifyboostershieldpenalty.py b/eos/effects/boostermodifyboostershieldpenalty.py
index 474584603..9498d005f 100755
--- a/eos/effects/boostermodifyboostershieldpenalty.py
+++ b/eos/effects/boostermodifyboostershieldpenalty.py
@@ -1,6 +1,6 @@
 # Used by:
 # Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
-# Implants named like: Low grade Edge (10 of 12)
+# Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"
 def handler(fit, container, context):
diff --git a/eos/effects/boostermodifyboosterturretpenalty.py b/eos/effects/boostermodifyboosterturretpenalty.py
index 6699acc12..8f10e8e08 100755
--- a/eos/effects/boostermodifyboosterturretpenalty.py
+++ b/eos/effects/boostermodifyboosterturretpenalty.py
@@ -1,6 +1,6 @@
 # Used by:
 # Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
-# Implants named like: Low grade Edge (10 of 12)
+# Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"
 def handler(fit, container, context):
diff --git a/eos/effects/caldarisetbonus3.py b/eos/effects/caldarisetbonus3.py
index 6a491223d..5659fab2b 100755
--- a/eos/effects/caldarisetbonus3.py
+++ b/eos/effects/caldarisetbonus3.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Talon (6 of 12)
+# Implants named like: High grade Talon (6 of 6)
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
diff --git a/eos/effects/dronetrackingcomputerbonus.py b/eos/effects/dronetrackingcomputerbonus.py
index 870d87334..1cc55be2c 100644
--- a/eos/effects/dronetrackingcomputerbonus.py
+++ b/eos/effects/dronetrackingcomputerbonus.py
@@ -1,6 +1,5 @@
 # Used by:
-# Variations of module: Omnidirectional Tracking Link I (7 of 7)
-# Module: Sentient Omnidirectional Tracking Link
+# Variations of module: Omnidirectional Tracking Link I (8 of 8)
 type = "active"
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
diff --git a/eos/effects/dronetrackingenhancerbonus.py b/eos/effects/dronetrackingenhancerbonus.py
index d1e4be90a..e74472c76 100644
--- a/eos/effects/dronetrackingenhancerbonus.py
+++ b/eos/effects/dronetrackingenhancerbonus.py
@@ -1,5 +1,5 @@
 # Used by:
-# Modules named like: Omnidirectional Tracking Enhancer (9 of 9)
+# Variations of module: Omnidirectional Tracking Enhancer I (9 of 9)
 type = "passive"
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
diff --git a/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py b/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py
index d76a2193b..321325197 100755
--- a/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py
+++ b/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py
@@ -1,6 +1,6 @@
 # Used by:
 # Implants named like: Eifyr and Co. 'Rogue' Evasive Maneuvering EM (6 of 6)
-# Implants named like: Low grade Nomad (10 of 12)
+# Implants named like: grade Nomad (10 of 12)
 # Modules named like: Low Friction Nozzle Joints (8 of 8)
 # Implant: Genolution Core Augmentation CA-4
 # Skill: Evasive Maneuvering
diff --git a/eos/effects/ewgroupecmburstmaxrangebonus.py b/eos/effects/ewgroupecmburstmaxrangebonus.py
index 7ca7594d2..aecc926bd 100755
--- a/eos/effects/ewgroupecmburstmaxrangebonus.py
+++ b/eos/effects/ewgroupecmburstmaxrangebonus.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Low grade Centurion (10 of 12)
+# Implants named like: grade Centurion (10 of 12)
 type = "passive"
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote ECM Burst",
diff --git a/eos/effects/ewgrouprsdmaxrangebonus.py b/eos/effects/ewgrouprsdmaxrangebonus.py
index 8f47b72bb..f01159ac0 100755
--- a/eos/effects/ewgrouprsdmaxrangebonus.py
+++ b/eos/effects/ewgrouprsdmaxrangebonus.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Low grade Centurion (10 of 12)
+# Implants named like: grade Centurion (10 of 12)
 type = "passive"
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Sensor Damper",
diff --git a/eos/effects/ewgrouptdmaxrangebonus.py b/eos/effects/ewgrouptdmaxrangebonus.py
index 00f7077c1..1f1f4bba0 100755
--- a/eos/effects/ewgrouptdmaxrangebonus.py
+++ b/eos/effects/ewgrouptdmaxrangebonus.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Low grade Centurion (10 of 12)
+# Implants named like: grade Centurion (10 of 12)
 type = "passive"
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
diff --git a/eos/effects/ewgrouptpmaxrangebonus.py b/eos/effects/ewgrouptpmaxrangebonus.py
index 959721c15..ff0d06cf8 100755
--- a/eos/effects/ewgrouptpmaxrangebonus.py
+++ b/eos/effects/ewgrouptpmaxrangebonus.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Low grade Centurion (10 of 12)
+# Implants named like: grade Centurion (10 of 12)
 type = "passive"
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
diff --git a/eos/effects/ewskillewmaxrangebonus.py b/eos/effects/ewskillewmaxrangebonus.py
index 78366ef3c..602885226 100755
--- a/eos/effects/ewskillewmaxrangebonus.py
+++ b/eos/effects/ewskillewmaxrangebonus.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Low grade Centurion (10 of 12)
+# Implants named like: grade Centurion (10 of 12)
 # Modules named like: Particle Dispersion Projector (8 of 8)
 # Skill: Long Distance Jamming
 type = "passive"
diff --git a/eos/effects/federationsetbonus3.py b/eos/effects/federationsetbonus3.py
index 0b088a4f6..f8884101a 100755
--- a/eos/effects/federationsetbonus3.py
+++ b/eos/effects/federationsetbonus3.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Spur (6 of 12)
+# Implants named like: High grade Spur (6 of 6)
 type = "passive"
 runTime = "early"
 def handler(fit, implant, context):
diff --git a/eos/effects/frequencymininglasermaxrangebonus.py b/eos/effects/frequencymininglasermaxrangebonus.py
index b9b52dcdd..efb90c698 100644
--- a/eos/effects/frequencymininglasermaxrangebonus.py
+++ b/eos/effects/frequencymininglasermaxrangebonus.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Low grade Harvest (10 of 12)
+# Implants named like: grade Harvest (10 of 12)
 type = "passive"
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Frequency Mining Laser",
diff --git a/eos/effects/gasharvestermaxrangebonus.py b/eos/effects/gasharvestermaxrangebonus.py
index 806ba5e56..7b9584617 100755
--- a/eos/effects/gasharvestermaxrangebonus.py
+++ b/eos/effects/gasharvestermaxrangebonus.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Low grade Harvest (10 of 12)
+# Implants named like: grade Harvest (10 of 12)
 type = "passive"
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Gas Cloud Harvester",
diff --git a/eos/effects/hullupgradesarmorhpbonuspostpercenthplocationship.py b/eos/effects/hullupgradesarmorhpbonuspostpercenthplocationship.py
index 0e588c77e..ad390607a 100755
--- a/eos/effects/hullupgradesarmorhpbonuspostpercenthplocationship.py
+++ b/eos/effects/hullupgradesarmorhpbonuspostpercenthplocationship.py
@@ -1,8 +1,8 @@
 # Used by:
-# Implants named like: Low grade Slave (10 of 12)
-# Implants named like: Low grade Snake Epsilon (2 of 2)
-# Implants named like: Slave (15 of 18)
+# Implants named like: grade Slave (15 of 18)
 # Modules named like: Trimark Armor Pump (8 of 8)
+# Implant: Low-grade Snake Epsilon
+# Implant: Mid-grade Snake Epsilon
 # Skill: Hull Upgrades
 type = "passive"
 def handler(fit, container, context):
diff --git a/eos/effects/imperialsetbonus3.py b/eos/effects/imperialsetbonus3.py
index a2b10dc66..5aa439b21 100755
--- a/eos/effects/imperialsetbonus3.py
+++ b/eos/effects/imperialsetbonus3.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Grail (6 of 12)
+# Implants named like: High grade Grail (6 of 6)
 type = "passive"
 runTime = "early"
 def handler(fit, implant, context):
diff --git a/eos/effects/implantsetwarpspeed.py b/eos/effects/implantsetwarpspeed.py
index df4f6ed2e..9ca307ec9 100644
--- a/eos/effects/implantsetwarpspeed.py
+++ b/eos/effects/implantsetwarpspeed.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Ascendancy (12 of 12)
+# Implants named like: grade Ascendancy (12 of 12)
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
diff --git a/eos/effects/mininglaserrangebonus.py b/eos/effects/mininglaserrangebonus.py
index 3812e93a2..001f71cfb 100755
--- a/eos/effects/mininglaserrangebonus.py
+++ b/eos/effects/mininglaserrangebonus.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Low grade Harvest (10 of 12)
+# Implants named like: grade Harvest (10 of 12)
 type = "passive"
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Mining Laser",
diff --git a/eos/effects/navigationvelocitybonuspostpercentmaxvelocitylocationship.py b/eos/effects/navigationvelocitybonuspostpercentmaxvelocitylocationship.py
index 60c15ba4c..a984b4657 100755
--- a/eos/effects/navigationvelocitybonuspostpercentmaxvelocitylocationship.py
+++ b/eos/effects/navigationvelocitybonuspostpercentmaxvelocitylocationship.py
@@ -1,5 +1,6 @@
 # Used by:
-# Implants named like: Low grade Snake Alpha (2 of 2)
+# Implant: Low-grade Snake Alpha
+# Implant: Mid-grade Snake Alpha
 type = "passive"
 def handler(fit, implant, context):
     fit.ship.boostItemAttr("maxVelocity", implant.getModifiedItemAttr("velocityBonus"))
\ No newline at end of file
diff --git a/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py b/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py
index 14b517ace..7931ec057 100755
--- a/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py
+++ b/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Snake (16 of 18)
+# Implants named like: grade Snake (16 of 18)
 # Modules named like: Auxiliary Thrusters (8 of 8)
 # Implant: Quafe Zero
 # Skill: Navigation
diff --git a/eos/effects/overloadselftrackingmodulebonus.py b/eos/effects/overloadselftrackingmodulebonus.py
index ff3782a5c..f8ce8e23a 100644
--- a/eos/effects/overloadselftrackingmodulebonus.py
+++ b/eos/effects/overloadselftrackingmodulebonus.py
@@ -2,8 +2,7 @@
 # Modules from group: Remote Tracking Computer (10 of 10)
 # Modules from group: Tracking Computer (14 of 14)
 # Modules from group: Tracking Disruptor (10 of 10)
-# Variations of module: Omnidirectional Tracking Link I (7 of 7)
-# Module: Sentient Omnidirectional Tracking Link
+# Variations of module: Omnidirectional Tracking Link I (8 of 8)
 type = "overheat"
 def handler(fit, module, context):
     module.boostItemAttr("maxRangeBonus", module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
diff --git a/eos/effects/republicsetbonus3.py b/eos/effects/republicsetbonus3.py
index 9849cc487..e49933dc8 100755
--- a/eos/effects/republicsetbonus3.py
+++ b/eos/effects/republicsetbonus3.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Jackal (6 of 12)
+# Implants named like: High grade Jackal (6 of 6)
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
diff --git a/eos/effects/scanstrengthbonuspercentpassive.py b/eos/effects/scanstrengthbonuspercentpassive.py
index a79337501..32438d66a 100755
--- a/eos/effects/scanstrengthbonuspercentpassive.py
+++ b/eos/effects/scanstrengthbonuspercentpassive.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants from group: Cyberimplant (20 of 217)
+# Implants named like: High grade (20 of 60)
 type = "passive"
 def handler(fit, implant, context):
     for type in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
diff --git a/eos/effects/scoutdroneoperationdronerangebonusmodadddronecontroldistancechar.py b/eos/effects/scoutdroneoperationdronerangebonusmodadddronecontroldistancechar.py
index 378abf61a..636c2995e 100755
--- a/eos/effects/scoutdroneoperationdronerangebonusmodadddronecontroldistancechar.py
+++ b/eos/effects/scoutdroneoperationdronerangebonusmodadddronecontroldistancechar.py
@@ -1,7 +1,6 @@
 # Used by:
 # Modules named like: Drone Control Range Augmentor (8 of 8)
-# Skill: Electronic Warfare Drone Interfacing
-# Skill: Scout Drone Operation
+# Skills named like: Drone Avionics (2 of 2)
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
diff --git a/eos/effects/setbonusbloodraider.py b/eos/effects/setbonusbloodraider.py
index 0f41f18c9..4e2ba6bcf 100755
--- a/eos/effects/setbonusbloodraider.py
+++ b/eos/effects/setbonusbloodraider.py
@@ -1,6 +1,5 @@
 # Used by:
-# Implants named like: Low grade Talisman (12 of 12)
-# Implants named like: Talisman (18 of 18)
+# Implants named like: grade Talisman (18 of 18)
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
diff --git a/eos/effects/setbonusbloodraidernosferatu.py b/eos/effects/setbonusbloodraidernosferatu.py
index 3a5783aa9..f950683d0 100755
--- a/eos/effects/setbonusbloodraidernosferatu.py
+++ b/eos/effects/setbonusbloodraidernosferatu.py
@@ -1,6 +1,5 @@
 # Used by:
-# Implants named like: Low grade Talisman (10 of 12)
-# Implants named like: Talisman (15 of 18)
+# Implants named like: grade Talisman (15 of 18)
 type = "passive"
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems"),
diff --git a/eos/effects/setbonusguristas.py b/eos/effects/setbonusguristas.py
index da427aa98..5468c382c 100755
--- a/eos/effects/setbonusguristas.py
+++ b/eos/effects/setbonusguristas.py
@@ -1,6 +1,5 @@
 # Used by:
-# Implants named like: Crystal (18 of 18)
-# Implants named like: Low grade Crystal (12 of 12)
+# Implants named like: grade Crystal (18 of 18)
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
diff --git a/eos/effects/setbonusmordus.py b/eos/effects/setbonusmordus.py
index 9d96007f0..18fed65c9 100755
--- a/eos/effects/setbonusmordus.py
+++ b/eos/effects/setbonusmordus.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Low grade Centurion (12 of 12)
+# Implants named like: grade Centurion (12 of 12)
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
diff --git a/eos/effects/setbonusore.py b/eos/effects/setbonusore.py
index 1b441586a..a4a4268e6 100755
--- a/eos/effects/setbonusore.py
+++ b/eos/effects/setbonusore.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Low grade Harvest (12 of 12)
+# Implants named like: grade Harvest (12 of 12)
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
diff --git a/eos/effects/setbonussansha.py b/eos/effects/setbonussansha.py
index fb221d33d..5a273a99f 100755
--- a/eos/effects/setbonussansha.py
+++ b/eos/effects/setbonussansha.py
@@ -1,7 +1,6 @@
 # Used by:
-# Implants named like: Low grade Slave (12 of 12)
-# Implants named like: Slave (18 of 18)
-# Implant: Halo Omega
+# Implants named like: grade Slave (18 of 18)
+# Implant: High-grade Halo Omega
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
diff --git a/eos/effects/setbonusserpentis.py b/eos/effects/setbonusserpentis.py
index f4e7e3091..74e46c5b5 100755
--- a/eos/effects/setbonusserpentis.py
+++ b/eos/effects/setbonusserpentis.py
@@ -1,6 +1,5 @@
 # Used by:
-# Implants named like: Low grade Snake (12 of 12)
-# Implants named like: Snake (18 of 18)
+# Implants named like: grade Snake (18 of 18)
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
diff --git a/eos/effects/setbonussisters.py b/eos/effects/setbonussisters.py
index 40bcaa856..31537d84f 100755
--- a/eos/effects/setbonussisters.py
+++ b/eos/effects/setbonussisters.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Low grade Virtue (12 of 12)
+# Implants named like: grade Virtue (12 of 12)
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
diff --git a/eos/effects/setbonussyndicate.py b/eos/effects/setbonussyndicate.py
index 359c37cc3..05ed0dcd5 100755
--- a/eos/effects/setbonussyndicate.py
+++ b/eos/effects/setbonussyndicate.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Low grade Edge (12 of 12)
+# Implants named like: grade Edge (12 of 12)
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
diff --git a/eos/effects/setbonusthukker.py b/eos/effects/setbonusthukker.py
index 114bf9316..e5e802656 100755
--- a/eos/effects/setbonusthukker.py
+++ b/eos/effects/setbonusthukker.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Low grade Nomad (12 of 12)
+# Implants named like: grade Nomad (12 of 12)
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
diff --git a/eos/effects/shieldboostamplifierpassive.py b/eos/effects/shieldboostamplifierpassive.py
index d1f29d730..4e69ec061 100755
--- a/eos/effects/shieldboostamplifierpassive.py
+++ b/eos/effects/shieldboostamplifierpassive.py
@@ -1,6 +1,5 @@
 # Used by:
-# Implants named like: Crystal (15 of 18)
-# Implants named like: Low grade Crystal (10 of 12)
+# Implants named like: grade Crystal (15 of 18)
 type = "passive"
 def handler(fit, container, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
diff --git a/eos/effects/shipbonuslightdronearmorhppiratefaction.py b/eos/effects/shipbonuslightdronearmorhppiratefaction.py
index 1b9d1ec22..8d3bc5abe 100644
--- a/eos/effects/shipbonuslightdronearmorhppiratefaction.py
+++ b/eos/effects/shipbonuslightdronearmorhppiratefaction.py
@@ -2,5 +2,5 @@
 # Ship: Worm
 type = "passive"
 def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Combat Drone Operation"),
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
                                  "armorHP", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonuslightdronedamagemultiplierpiratefaction.py b/eos/effects/shipbonuslightdronedamagemultiplierpiratefaction.py
index 1b94144e5..b32738969 100644
--- a/eos/effects/shipbonuslightdronedamagemultiplierpiratefaction.py
+++ b/eos/effects/shipbonuslightdronedamagemultiplierpiratefaction.py
@@ -2,5 +2,5 @@
 # Ship: Worm
 type = "passive"
 def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Combat Drone Operation"),
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonuslightdronehppiratefaction.py b/eos/effects/shipbonuslightdronehppiratefaction.py
index 352f51054..d17415975 100644
--- a/eos/effects/shipbonuslightdronehppiratefaction.py
+++ b/eos/effects/shipbonuslightdronehppiratefaction.py
@@ -2,5 +2,5 @@
 # Ship: Worm
 type = "passive"
 def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Combat Drone Operation"),
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
                                  "hp", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonuslightdroneshieldhppiratefaction.py b/eos/effects/shipbonuslightdroneshieldhppiratefaction.py
index 94df954ac..46af165d7 100644
--- a/eos/effects/shipbonuslightdroneshieldhppiratefaction.py
+++ b/eos/effects/shipbonuslightdroneshieldhppiratefaction.py
@@ -2,5 +2,5 @@
 # Ship: Worm
 type = "passive"
 def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Combat Drone Operation"),
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
                                  "shieldCapacity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipdronescoutthermaldamagegf2.py b/eos/effects/shipdronescoutthermaldamagegf2.py
index 537cd01dc..4a8902d0b 100755
--- a/eos/effects/shipdronescoutthermaldamagegf2.py
+++ b/eos/effects/shipdronescoutthermaldamagegf2.py
@@ -3,5 +3,5 @@
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Frigate").level
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Scout Drone Operation"),
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drone Avionics"),
                                  "thermalDamage", ship.getModifiedItemAttr("shipBonusGF2") * level)
diff --git a/eos/effects/shipmissileemdamagecf.py b/eos/effects/shipmissileemdamagecf2.py
similarity index 90%
rename from eos/effects/shipmissileemdamagecf.py
rename to eos/effects/shipmissileemdamagecf2.py
index d04d3d137..9ea9dd556 100644
--- a/eos/effects/shipmissileemdamagecf.py
+++ b/eos/effects/shipmissileemdamagecf2.py
@@ -5,4 +5,4 @@ type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Frigate").level
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusCF") * level)
+                                    "emDamage", ship.getModifiedItemAttr("shipBonusCF2") * level)
diff --git a/eos/effects/shipmissileexplosivedamagecf.py b/eos/effects/shipmissileexplosivedamagecf2.py
similarity index 89%
rename from eos/effects/shipmissileexplosivedamagecf.py
rename to eos/effects/shipmissileexplosivedamagecf2.py
index 562770e7e..e5a700628 100644
--- a/eos/effects/shipmissileexplosivedamagecf.py
+++ b/eos/effects/shipmissileexplosivedamagecf2.py
@@ -5,4 +5,4 @@ type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Frigate").level
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusCF") * level)
+                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusCF2") * level)
diff --git a/eos/effects/shipmissilekineticdamagecf.py b/eos/effects/shipmissilekineticdamagecf.py
index a73999723..32cab4966 100755
--- a/eos/effects/shipmissilekineticdamagecf.py
+++ b/eos/effects/shipmissilekineticdamagecf.py
@@ -2,7 +2,6 @@
 # Ship: Buzzard
 # Ship: Caldari Navy Hookbill
 # Ship: Condor
-# Ship: Garmur
 # Ship: Hawk
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipmissilekineticdamagecf2.py b/eos/effects/shipmissilekineticdamagecf2.py
new file mode 100644
index 000000000..94fa75f56
--- /dev/null
+++ b/eos/effects/shipmissilekineticdamagecf2.py
@@ -0,0 +1,7 @@
+# Used by:
+# Ship: Garmur
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Caldari Frigate").level
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCF2") * level)
diff --git a/eos/effects/shipmissilethermaldamagecf.py b/eos/effects/shipmissilethermaldamagecf2.py
similarity index 89%
rename from eos/effects/shipmissilethermaldamagecf.py
rename to eos/effects/shipmissilethermaldamagecf2.py
index 9b75f2d64..6c925950b 100644
--- a/eos/effects/shipmissilethermaldamagecf.py
+++ b/eos/effects/shipmissilethermaldamagecf2.py
@@ -5,4 +5,4 @@ type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Frigate").level
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusCF") * level)
+                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusCF2") * level)
diff --git a/eos/effects/stripminermaxrangebonus.py b/eos/effects/stripminermaxrangebonus.py
index b7978b88c..4c8cb82ac 100755
--- a/eos/effects/stripminermaxrangebonus.py
+++ b/eos/effects/stripminermaxrangebonus.py
@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Low grade Harvest (10 of 12)
+# Implants named like: grade Harvest (10 of 12)
 type = "passive"
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Strip Miner",
diff --git a/eos/effects/structurestealthemitterarraysigdecrease.py b/eos/effects/structurestealthemitterarraysigdecrease.py
index 23edc4a14..f16cfcb0a 100755
--- a/eos/effects/structurestealthemitterarraysigdecrease.py
+++ b/eos/effects/structurestealthemitterarraysigdecrease.py
@@ -1,7 +1,6 @@
 # Used by:
-# Implants named like: Halo (15 of 18)
-# Implants named like: Low grade Halo (10 of 12)
 # Implants named like: X Instinct Booster (4 of 4)
+# Implants named like: grade Halo (15 of 18)
 type = "passive"
 def handler(fit, implant, context):
     fit.ship.boostItemAttr("signatureRadius", implant.getModifiedItemAttr("signatureRadiusBonus"))
diff --git a/eos/effects/warpskillspeed.py b/eos/effects/warpskillspeed.py
index 4af697ef9..7f10f6139 100755
--- a/eos/effects/warpskillspeed.py
+++ b/eos/effects/warpskillspeed.py
@@ -1,6 +1,6 @@
 # Used by:
-# Implants named like: Ascendancy (10 of 12)
 # Implants named like: Eifyr and Co. 'Rogue' Warp Drive Speed WS (6 of 6)
+# Implants named like: grade Ascendancy (10 of 12)
 # Modules named like: Hyperspatial Velocity Optimizer (8 of 8)
 type = "passive"
 def handler(fit, container, context):
diff --git a/staticdata/eve.db b/staticdata/eve.db
index c1b0e9fcd..b229abd9f 100644
Binary files a/staticdata/eve.db and b/staticdata/eve.db differ
diff --git a/staticdata/icons/ships/33697.png b/staticdata/icons/ships/33697.png
new file mode 100644
index 000000000..e2c5c3537
Binary files /dev/null and b/staticdata/icons/ships/33697.png differ
diff --git a/staticdata/icons/ships/33816.png b/staticdata/icons/ships/33816.png
new file mode 100644
index 000000000..0a7ac45f0
Binary files /dev/null and b/staticdata/icons/ships/33816.png differ
diff --git a/staticdata/icons/ships/33818.png b/staticdata/icons/ships/33818.png
new file mode 100644
index 000000000..dc27cc186
Binary files /dev/null and b/staticdata/icons/ships/33818.png differ
diff --git a/staticdata/icons/ships/33820.png b/staticdata/icons/ships/33820.png
new file mode 100644
index 000000000..022bb9fc3
Binary files /dev/null and b/staticdata/icons/ships/33820.png differ