diff --git a/eos/gamedata.py b/eos/gamedata.py
index 737b58d48..7d0852739 100644
--- a/eos/gamedata.py
+++ b/eos/gamedata.py
@@ -343,7 +343,11 @@ class Item(EqBase):
         if self.__race is None:
 
             try:
-                if self.category.categoryName == 'Structure':
+                if (
+                    self.category.categoryName == 'Structure' or
+                    # Here until CCP puts their shit together
+                    self.name in ("Thunderchild", "Stormbringer", "Skybreaker")
+                ):
                     self.__race = "upwell"
                 else:
                     self.__race = self.factionMap[self.factionID]
diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py
index 6f3ac84fb..009079454 100644
--- a/gui/shipBrowser.py
+++ b/gui/shipBrowser.py
@@ -191,7 +191,7 @@ class ShipBrowser(wx.Panel):
         "amarr", "caldari", "gallente", "minmatar",
         "sisters", "ore", "concord",
         "serpentis", "angel", "blood", "sansha", "guristas", "mordu",
-        "jove", "upwell", "triglavian", None
+        "jove", "triglavian", "upwell", None
     ]
 
     def raceNameKey(self, ship):