diff --git a/eos/gamedata.py b/eos/gamedata.py
index b9b6761ae..afbf03481 100644
--- a/eos/gamedata.py
+++ b/eos/gamedata.py
@@ -343,7 +343,8 @@ class Item(EqBase):
         500018: "mordu",
         500019: "sansha",
         500020: "serpentis",
-        500026: "triglavian"
+        500026: "triglavian",
+        500027: "upwell",
     }
 
     @property
@@ -351,11 +352,7 @@ class Item(EqBase):
         if self.__race is None:
 
             try:
-                if (
-                    self.category.name == 'Structure' or
-                    # Here until CCP puts their shit together
-                    self.name in ("Thunderchild", "Stormbringer", "Skybreaker")
-                ):
+                if self.category.name == 'Structure':
                     self.__race = "upwell"
                 else:
                     self.__race = self.factionMap[self.factionID]