diff --git a/core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php b/core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php
index 09e1e09..5f03a39 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php
@@ -117,7 +117,7 @@ protected function entityCreate($entity_type) {
       case 'user':
         return entity_create('user', array('name' => $this->randomName()));
       case 'view_mode':
-        return entity_create('view_mode', array('name' => $this->randomName(), 'machineName' => 'node.test'));
+        return entity_create('view_mode', array('label' => $this->randomName(), 'id' => 'node.test'));
       default:
         return entity_create($entity_type, array());
     }
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 8c0f129..1815466 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -2270,13 +2270,13 @@ function system_update_8037() {
 
   foreach ($entity_view_modes as $entity_type => $view_modes) {
     foreach ($view_modes as $key => $name) {
-      $custom = ($key == 'teaser');
+      $hasSettings = ($key == 'teaser');
       config('view_mode.' . $entity_type . '.' . $key)
-        ->set('machineName', $entity_type . '.' . $key)
-        ->set('name', $name)
+        ->set('id', $entity_type . '.' . $key)
+        ->set('label', $name)
         ->set('targetEntityType', $entity_type)
         ->set('locked', TRUE)
-        ->set('custom', $custom)
+        ->set('hasSettings', $hasSettings)
         ->save();
     }
   }