diff --git a/fieldblock.module b/fieldblock.module
index 85540a97dd4392e5a6027a4cade418e8817072e6..01a63b10541a35dcc593e60727130fdcbf5c9d21 100644
--- a/fieldblock.module
+++ b/fieldblock.module
@@ -55,19 +55,19 @@ function fieldblock_field_display_submit($form, FormStateInterface $form_state)
   $bundle = $form['#bundle'];
   $mode = $form['#mode'];
 
-  /** @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface $view_mode_config */
-  $view_mode_config = EntityViewDisplay::load($entity_type . '.' . $bundle . '.' . $mode);
+  /** @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface $entity_view_display */
+  $entity_view_display = EntityViewDisplay::load($entity_type . '.' . $bundle . '.' . $mode);
 
   $fields = $form_state->getValue('fields');
   foreach ($fields as $field_name => $field) {
     if (isset($field['fieldblock']) && $field['fieldblock'] == 1) {
-      $view_mode_config->setThirdPartySetting('fieldblock', $field_name, $form['fields'][$field_name]['human_name']['#markup']);
+      $entity_view_display->setThirdPartySetting('fieldblock', $field_name, $form['fields'][$field_name]['human_name']['#markup']);
     }
-    else if ($view_mode_config->getThirdPartySetting('fieldblock', $field_name)) {
-      $view_mode_config->unsetThirdPartySetting('fieldblock', $field_name);
+    else if ($entity_view_display->getThirdPartySetting('fieldblock', $field_name)) {
+      $entity_view_display->unsetThirdPartySetting('fieldblock', $field_name);
     }
   }
-  $view_mode_config->save();
+  $entity_view_display->save();
 
   // Invalidate the block cache to update fielblock derivatives.
   if (\Drupal::moduleHandler()->moduleExists('block')) {