diff --git a/display_machine_name.module b/display_machine_name.module
index 1eb85dd..90f3615 100644
--- a/display_machine_name.module
+++ b/display_machine_name.module
@@ -88,6 +88,20 @@ function display_machine_name_set_display_submit(&$form, FormStateInterface $for
 
   $name_service = \Drupal::service('display_machine_name.general_service');
   $name_service->enableDisplayMachineName($form_display, $machine_names_enabled);
+}
 
-  // $form_display->setThirdPartySetting('display_machine_name', DISPLAY_MACHINE_NAME_ENABLED_ID, $machine_names_enabled)->save();
+/**
+ * Implements hook_module_implements_alter().
+ */
+function display_machine_name_module_implements_alter(&$implementations, $hook) {
+  // var_dump($hook);
+  // Put our alter after all others e.g. field_group.
+  if ($hook == 'form_entity_form_display_edit_form_alter' ||
+    $hook == 'form_alter') {
+    if (isset($implementations['display_machine_name'])) {
+      $group = $implementations['display_machine_name'];
+      unset($implementations['display_machine_name']);
+      $implementations['display_machine_name'] = $group;
+    }
+  }
 }
diff --git a/src/Service/DisplayMachineNameService.php b/src/Service/DisplayMachineNameService.php
index ca5948b..dec593e 100644
--- a/src/Service/DisplayMachineNameService.php
+++ b/src/Service/DisplayMachineNameService.php
@@ -32,6 +32,13 @@ class DisplayMachineNameService {
       $field_label = $form['fields'][$field_name]['human_name']['#plain_text'];
       $form['fields'][$field_name]['human_name']['#plain_text'] = $this->getChangedFieldLabel($field_label, $field_name);
     }
+
+    if (isset($form['#fieldgroups'])) {
+      foreach ($form['#fieldgroups'] as $field_group_name) {
+        $field_label = $form['fields'][$field_group_name]['human_name']['#markup'];
+        $form['fields'][$field_group_name]['human_name']['#markup'] = $this->getChangedFieldLabel($field_label, $field_group_name);
+      }
+    }
   }
 
 }