diff --git a/db_update.py b/db_update.py
index 29485e147..69ee22e97 100644
--- a/db_update.py
+++ b/db_update.py
@@ -169,7 +169,8 @@ def update_db():
     def processEveGroups():
         print('processing evegroups')
         data = _readData('fsd_lite', 'evegroups', keyIdName='groupID')
-        map = {'groupName_en-us': 'groupName'}
+        map = {'groupName_en-us': 'displayName'}
+        map.update({'groupName'+v: 'name'+v for (k, v) in eos.config.translation_mapping.items() if k != 'en_US'})
         _addRows(data, eos.gamedata.Group, fieldMap=map)
         return data
 
diff --git a/eos/db/gamedata/group.py b/eos/db/gamedata/group.py
index 4891143f3..8ceb39b96 100644
--- a/eos/db/gamedata/group.py
+++ b/eos/db/gamedata/group.py
@@ -26,7 +26,7 @@ import eos.config
 
 groups_table = Table("invgroups", gamedata_meta,
                      Column("groupID", Integer, primary_key=True),
-                     *[Column("groupName{}".format(lang), String) for lang in eos.config.translation_mapping.values()],
+                     *[Column("name{}".format(lang), String) for lang in eos.config.translation_mapping.values()],
                      # Column("description", String), # deprecated
                      Column("published", Boolean),
                      Column("categoryID", Integer, ForeignKey("invcategories.categoryID")),
@@ -36,6 +36,6 @@ mapper(Group, groups_table,
        properties={
            "category"   : relation(Category, backref=backref("groups", cascade="all,delete")),
            "ID"         : synonym("groupID"),
-           "name"       : synonym("groupName{}".format(eos.config.lang)),
+           "displayName"       : synonym("name{}".format(eos.config.lang)),
            # "description": deferred(groups_table.c.description) # deprecated
        })
diff --git a/eos/db/gamedata/queries.py b/eos/db/gamedata/queries.py
index 0992af87f..5e0992a5f 100644
--- a/eos/db/gamedata/queries.py
+++ b/eos/db/gamedata/queries.py
@@ -205,7 +205,7 @@ def getGroup(lookfor, eager=None):
                 group = get_gamedata_session().query(Group).options(*processEager(eager)).filter(Group.ID == id).first()
         else:
             # Group names are unique, so we can use first() instead of one()
-            group = get_gamedata_session().query(Group).options(*processEager(eager)).filter(Group.groupName == lookfor).first()
+            group = get_gamedata_session().query(Group).options(*processEager(eager)).filter(Group.name == lookfor).first()
             if group is not None:
                 groupNameMap[lookfor] = group.ID
     else:
diff --git a/eos/saveddata/booster.py b/eos/saveddata/booster.py
index 8f308d6f2..8864ace65 100644
--- a/eos/saveddata/booster.py
+++ b/eos/saveddata/booster.py
@@ -91,7 +91,7 @@ class Booster(HandledItem, ItemAttrShortcut):
 
     @property
     def isInvalid(self):
-        return self.__item is None or self.__item.group.groupName != "Booster"
+        return self.__item is None or self.__item.group.name != "Booster"
 
     @property
     def slot(self):
diff --git a/gui/builtinAdditionPanes/fighterView.py b/gui/builtinAdditionPanes/fighterView.py
index 7403f29b6..dd1da2503 100644
--- a/gui/builtinAdditionPanes/fighterView.py
+++ b/gui/builtinAdditionPanes/fighterView.py
@@ -255,7 +255,7 @@ class FighterDisplay(d.Display):
 
     @staticmethod
     def fighterKey(fighter):
-        groupName = Market.getInstance().getGroupByItem(fighter.item).groupName
+        groupName = Market.getInstance().getGroupByItem(fighter.item).name
         orderPos = FIGHTER_ORDER.index(groupName)
         # Sort support fighters by name, ignore their abilities
         if groupName == 'Support Fighter':
diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py
index 86c98b133..9a3282858 100644
--- a/gui/builtinViewColumns/misc.py
+++ b/gui/builtinViewColumns/misc.py
@@ -68,7 +68,7 @@ class Miscellanea(ViewColumn):
         item = stuff.item
         if item is None:
             return "", None
-        itemGroup = item.group.groupName
+        itemGroup = item.group.name
         itemCategory = item.category.name
 
         if itemGroup == "Ship Modifiers":
diff --git a/service/market.py b/service/market.py
index 59ebaf5c5..2d8a05383 100644
--- a/service/market.py
+++ b/service/market.py
@@ -508,7 +508,7 @@ class Market:
             # Check custom groups
             for cgrp in self.customGroups:
                 # During first comparison we need exact int, not float for matching
-                if cgrp.ID == identity or cgrp.groupName == identity:
+                if cgrp.ID == identity or cgrp.name == identity:
                     # Return first match
                     return cgrp
             # Return eos group if everything else returned nothing