diff --git a/scm-ui/ui-webapp/public/locales/de/groups.json b/scm-ui/ui-webapp/public/locales/de/groups.json
index 3e101ddf8c..3957e2df33 100644
--- a/scm-ui/ui-webapp/public/locales/de/groups.json
+++ b/scm-ui/ui-webapp/public/locales/de/groups.json
@@ -12,7 +12,8 @@
   "groups": {
     "title": "Gruppen",
     "subtitle": "Verwaltung der Gruppen",
-    "noGroups": "Keine Gruppen gefunden."
+    "noGroups": "Keine Gruppen gefunden.",
+    "createButton": "Gruppe erstellen"
   },
   "singleGroup": {
     "errorTitle": "Fehler",
@@ -28,24 +29,10 @@
   "overview": {
     "filterGroup": "Gruppen filtern"
   },
-  "add-group": {
+  "addGroup": {
     "title": "Gruppe erstellen",
     "subtitle": "Erstellen einer neuen Gruppe"
   },
-  "create-group-button": {
-    "label": "Gruppe erstellen"
-  },
-  "edit-group-button": {
-    "label": "Bearbeiten"
-  },
-  "add-member-button": {
-    "label": "Mitglied hinzufügen"
-  },
-  "add-member-autocomplete": {
-    "placeholder": "Mitglied hinzufügen",
-    "loading": "Suche ...",
-    "no-options": "Kein Vorschlag für Benutzername verfügbar"
-  },
   "groupForm": {
     "subtitle": "Gruppe bearbeiten",
     "externalSubtitle": "Externe Gruppe bearbeiten",
@@ -57,6 +44,12 @@
       "descriptionHelpText": "Eine kurze Beschreibung der Gruppe",
       "memberHelpText": "Benutzername des Mitglieds der Gruppe",
       "externalHelpText": "Mitglieder dieser Gruppe werden von einem externen System wie z.B.: einem LDAP-Server verwaltet"
+    },
+    "addMemberAutocomplete": {
+      "buttonLabel": "Mitglied hinzufügen",
+      "placeholder": "Mitglied hinzufügen",
+      "loading": "Suche ...",
+      "noOptions": "Kein Vorschlag für Benutzername verfügbar"
     }
   },
   "deleteGroup": {
diff --git a/scm-ui/ui-webapp/public/locales/en/groups.json b/scm-ui/ui-webapp/public/locales/en/groups.json
index 3e8988d6a9..b057c3a314 100644
--- a/scm-ui/ui-webapp/public/locales/en/groups.json
+++ b/scm-ui/ui-webapp/public/locales/en/groups.json
@@ -12,7 +12,8 @@
   "groups": {
     "title": "Groups",
     "subtitle": "Create, read, update and delete groups",
-    "noGroups": "No groups found."
+    "noGroups": "No groups found.",
+    "createButton": "Create Group"
   },
   "singleGroup": {
     "errorTitle": "Error",
@@ -28,24 +29,10 @@
   "overview": {
     "filterGroup": "Filter groups"
   },
-  "add-group": {
+  "addGroup": {
     "title": "Create Group",
     "subtitle": "Create a new group"
   },
-  "create-group-button": {
-    "label": "Create Group"
-  },
-  "edit-group-button": {
-    "label": "Edit"
-  },
-  "add-member-button": {
-    "label": "Add Member"
-  },
-  "add-member-autocomplete": {
-    "placeholder": "Add Member",
-    "loading": "Loading ...",
-    "no-options": "No suggestion available"
-  },
   "groupForm": {
     "subtitle": "Edit Group",
     "externalSubtitle": "Edit External Group",
@@ -57,6 +44,12 @@
       "descriptionHelpText": "A short description of the group",
       "memberHelpText": "Usernames of the group members",
       "externalHelpText": "Members are managed by an external system such as LDAP"
+    },
+    "addMemberAutocomplete": {
+      "buttonLabel": "Add Member",
+      "placeholder": "Add Member",
+      "loading": "Loading ...",
+      "noOptions": "No suggestion available"
     }
   },
   "deleteGroup": {
diff --git a/scm-ui/ui-webapp/public/locales/es/groups.json b/scm-ui/ui-webapp/public/locales/es/groups.json
index 3f39696665..928b4c2e96 100644
--- a/scm-ui/ui-webapp/public/locales/es/groups.json
+++ b/scm-ui/ui-webapp/public/locales/es/groups.json
@@ -12,7 +12,8 @@
   "groups": {
     "title": "Grupos",
     "subtitle": "Crear, leer, actualizar y borrar grupos",
-    "noGroups": "No se han encontrado grupos."
+    "noGroups": "No se han encontrado grupos.",
+    "createButton": "Crear grupo"
   },
   "singleGroup": {
     "errorTitle": "Error",
@@ -25,24 +26,10 @@
       "setPermissionsNavLink": "Permisos"
     }
   },
-  "add-group": {
+  "addGroup": {
     "title": "Crear grupo",
     "subtitle": "Crear un nuevo grupo"
   },
-  "create-group-button": {
-    "label": "Crear grupo"
-  },
-  "edit-group-button": {
-    "label": "Editar"
-  },
-  "add-member-button": {
-    "label": "Añadir miembro"
-  },
-  "add-member-autocomplete": {
-    "placeholder": "Añadir miembro",
-    "loading": "Cargando...",
-    "no-options": "No hay sugerencias disponibles"
-  },
   "groupForm": {
     "subtitle": "Editar grupo",
     "externalSubtitle": "Editar grupo externo",
@@ -54,6 +41,12 @@
       "descriptionHelpText": "Descripción breve del grupo",
       "memberHelpText": "Nombres de usuario de los miembros del grupo",
       "externalHelpText": "Los miembros son gestionados por un sistema externo como por ejemplo LDAP"
+    },
+    "addMemberAutocomplete": {
+      "buttonLabel": "Añadir miembro",
+      "placeholder": "Añadir miembro",
+      "loading": "Cargando ...",
+      "noOptions": "No hay sugerencias disponibles"
     }
   },
   "deleteGroup": {
diff --git a/scm-ui/ui-webapp/src/groups/components/GroupForm.tsx b/scm-ui/ui-webapp/src/groups/components/GroupForm.tsx
index 7c58a0d872..5fdbbc3407 100644
--- a/scm-ui/ui-webapp/src/groups/components/GroupForm.tsx
+++ b/scm-ui/ui-webapp/src/groups/components/GroupForm.tsx
@@ -90,11 +90,11 @@ const GroupForm: FC<Props> = ({ submitForm, loading, group, loadUserSuggestions
         <AutocompleteAddEntryToTableField
           addEntry={addMember}
           disabled={false}
-          buttonLabel={t("add-member-button.label")}
+          buttonLabel={t("groupForm.addMemberAutocomplete.buttonLabel")}
           loadSuggestions={loadUserSuggestions}
-          placeholder={t("add-member-autocomplete.placeholder")}
-          loadingMessage={t("add-member-autocomplete.loading")}
-          noOptionsMessage={t("add-member-autocomplete.no-options")}
+          placeholder={t("groupForm.addMemberAutocomplete.placeholder")}
+          loadingMessage={t("groupForm.addMemberAutocomplete.loading")}
+          noOptionsMessage={t("groupForm.addMemberAutocomplete.noOptions")}
         />
       </>
     );
diff --git a/scm-ui/ui-webapp/src/groups/containers/CreateGroup.tsx b/scm-ui/ui-webapp/src/groups/containers/CreateGroup.tsx
index 5a7f3f521b..62f841fee1 100644
--- a/scm-ui/ui-webapp/src/groups/containers/CreateGroup.tsx
+++ b/scm-ui/ui-webapp/src/groups/containers/CreateGroup.tsx
@@ -38,7 +38,7 @@ const CreateGroup: FC = () => {
   }
 
   return (
-    <Page title={t("add-group.title")} subtitle={t("add-group.subtitle")} error={error || undefined}>
+    <Page title={t("addGroup.title")} subtitle={t("addGroup.subtitle")} error={error || undefined}>
       <div>
         <GroupForm submitForm={create} loading={isLoading} loadUserSuggestions={userSuggestions} />
       </div>
diff --git a/scm-ui/ui-webapp/src/groups/containers/Groups.tsx b/scm-ui/ui-webapp/src/groups/containers/Groups.tsx
index e42f0e028d..f6f922c4a1 100644
--- a/scm-ui/ui-webapp/src/groups/containers/Groups.tsx
+++ b/scm-ui/ui-webapp/src/groups/containers/Groups.tsx
@@ -66,12 +66,12 @@ const Groups: FC = () => {
       error={error || undefined}
     >
       {renderGroupTable()}
-      {canCreateGroups ? <CreateButton label={t("create-group-button.label")} link="/groups/create" /> : null}
+      {canCreateGroups ? <CreateButton label={t("groups.createButton")} link="/groups/create" /> : null}
       <PageActions>
         <OverviewPageActions
           showCreateButton={canCreateGroups}
           link="groups"
-          label={t("create-group-button.label")}
+          label={t("groups.createButton")}
           searchPlaceholder={t("overview.filterGroup")}
         />
       </PageActions>