diff --git b/core/lib/Drupal/Core/Entity/ViewMode/EntityViewModeStorageController.php a/core/lib/Drupal/Core/Entity/ViewMode/EntityViewModeStorageController.php
index fb597b1..5d6b193 100644
--- b/core/lib/Drupal/Core/Entity/ViewMode/EntityViewModeStorageController.php
+++ a/core/lib/Drupal/Core/Entity/ViewMode/EntityViewModeStorageController.php
@@ -8,6 +8,7 @@
 namespace Drupal\Core\Entity\ViewMode;
 
 use Drupal\Core\Config\Entity\ConfigStorageController;
+use Drupal\Core\Entity\EntityInterface;
 
 /**
  * Defines the storage controller class for entity view modes.
@@ -17,7 +18,7 @@ class EntityViewModeStorageController extends ConfigStorageController {
   /**
    * Overrides ConfigStorageController::preSave().
    */
-  protected function preSave(EntityViewMode $view_mode) {
+  protected function preSave(EntityInterface $view_mode) {
     entity_info_cache_clear();
   }
 
diff --git b/core/lib/Drupal/Core/Plugin/Core/Entity/EntityViewMode.php a/core/lib/Drupal/Core/Plugin/Core/Entity/EntityViewMode.php
index 36ee328..1dc71f6 100644
--- b/core/lib/Drupal/Core/Plugin/Core/Entity/EntityViewMode.php
+++ a/core/lib/Drupal/Core/Plugin/Core/Entity/EntityViewMode.php
@@ -18,12 +18,11 @@
  *   id = "view_mode",
  *   label = @Translation("View mode"),
  *   module = "Core",
- *   entity_class = "Drupal\Core\Entity\ViewMode\EntityViewMode",
  *   controller_class = "Drupal\Core\Entity\ViewMode\EntityViewModeStorageController",
  *   config_prefix = "view_mode",
  *   fieldable = FALSE,
  *   entity_keys = {
- *     "id" = "machine_name",
+ *     "id" = "machineName",
  *     "label" = "name",
  *     "uuid" = "uuid"
  *   }
diff --git b/core/modules/entity_ui/entity_ui.admin.inc a/core/modules/entity_ui/entity_ui.admin.inc
index fce7b93..d885c6f 100644
--- b/core/modules/entity_ui/entity_ui.admin.inc
+++ a/core/modules/entity_ui/entity_ui.admin.inc
@@ -14,7 +14,7 @@ function entity_ui_view_mode_list() {
   $controller = entity_list_controller('view_mode');
   foreach (entity_get_info() as $type => $info) {
     // @todo Revisit the assumption that only content entities can have view modes.
-    if (is_subclass_of($info['entity_class'], 'Drupal\Core\Entity\ContentEntityInterface')) {
+    if (is_subclass_of($info['class'], 'Drupal\Core\Entity\ContentEntityInterface')) {
       $build[$type]['title']['#markup'] = '<h3>' . check_plain($info['label']) . '</h3>';
       $build[$type]['table'] = $controller->set($type)->render();
       // Node is usually the most important entity type in the system.
@@ -28,8 +28,8 @@ function entity_ui_view_mode_list() {
 /**
  * Menu callback: view mode edit form.
  */
-function entity_ui_view_mode_add($type) {
-  $view_mode = entity_create('view_mode', array('type' => $type));
+function entity_ui_view_mode_add($entity_type) {
+  $view_mode = entity_create('view_mode', array('targetEntityType' => $entity_type));
   return entity_get_form($view_mode);
 }
 
diff --git b/core/modules/entity_ui/lib/Drupal/entity_ui/Tests/ViewModeTest.php a/core/modules/entity_ui/lib/Drupal/entity_ui/Tests/ViewModeTest.php
index 5114d91..7e88ab6 100644
--- b/core/modules/entity_ui/lib/Drupal/entity_ui/Tests/ViewModeTest.php
+++ a/core/modules/entity_ui/lib/Drupal/entity_ui/Tests/ViewModeTest.php
@@ -42,7 +42,7 @@ function setUp() {
   function testManageViewModes() {
     $edit = array(
       'name' => 'Testing',
-      'machine_name' => 'testing',
+      'machineName' => 'testing',
     );
     $this->drupalPost('admin/config/system/view-modes/add/node', $edit, t('Save'));
     $this->assertText(format_string('Saved the !name view mode.', array('!name' => $edit['name'])));
diff --git b/core/modules/entity_ui/lib/Drupal/entity_ui/ViewModeFormController.php a/core/modules/entity_ui/lib/Drupal/entity_ui/ViewModeFormController.php
index c4d2f58..69e697f 100644
--- b/core/modules/entity_ui/lib/Drupal/entity_ui/ViewModeFormController.php
+++ a/core/modules/entity_ui/lib/Drupal/entity_ui/ViewModeFormController.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\entity_ui;
 
-use Drupal\Core\Plugin\Core\Entity\EntityViewMode;
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityFormController;
 
 /**
@@ -18,9 +18,9 @@ class ViewModeFormController extends EntityFormController {
   /**
    * Overrides Drupal\Core\Entity\EntityFormController::form().
    */
-  public function form(array $form, array &$form_state, EntityViewMode $view_mode) {
+  public function form(array $form, array &$form_state, EntityInterface $view_mode) {
     $entity_info = entity_get_info($view_mode->targetEntityType);
-    $form['type'] = array(
+    $form['targetEntityType'] = array(
       '#type' => 'item',
       '#title' => t('Entity type'),
       '#markup' => check_plain($entity_info['label']),
@@ -32,7 +32,7 @@ public function form(array $form, array &$form_state, EntityViewMode $view_mode)
       '#required' => TRUE,
     );
 
-    $form['machine_name'] = array(
+    $form['machineName'] = array(
       '#type' => 'machine_name',
       '#machine_name' => array(
         'source' => array('name'),
@@ -41,7 +41,7 @@ public function form(array $form, array &$form_state, EntityViewMode $view_mode)
       '#entity_type' => $view_mode->targetEntityType,
       '#default_value' => $view_mode->name(),
       '#disabled' => !$view_mode->isNew(),
-      '#field_prefix' => "$view_mode->type.",
+      '#field_prefix' => $view_mode->targetEntityType . '.',
     );
 
     return $form;
@@ -62,7 +62,7 @@ protected function actions(array $form, array &$form_state) {
    */
   public function validate(array $form, array &$form_state) {
     $view_mode = clone $this->getEntity($form_state);
-    form_set_value($form['machine_name'], $view_mode->targetEntityType . '.' . $form_state['values']['machine_name'], $form_state);
+    form_set_value($form['machineName'], $view_mode->targetEntityType . '.' . $form_state['values']['machineName'], $form_state);
     parent::validate($form, $form_state);
   }
 
diff --git b/core/modules/entity_ui/lib/Drupal/entity_ui/ViewModeListController.php a/core/modules/entity_ui/lib/Drupal/entity_ui/ViewModeListController.php
index d8e2d86..3bb3841 100644
--- b/core/modules/entity_ui/lib/Drupal/entity_ui/ViewModeListController.php
+++ a/core/modules/entity_ui/lib/Drupal/entity_ui/ViewModeListController.php
@@ -8,7 +8,7 @@
 namespace Drupal\entity_ui;
 
 use Drupal\Core\Config\Entity\ConfigEntityListController;
-use Drupal\Core\Plugin\Core\Entity\EntityViewMode;
+use Drupal\Core\Entity\EntityInterface;
 
 /**
  * Provides a listing of view modes.
@@ -72,7 +72,7 @@ public function buildHeader() {
   /**
    * Overrides Drupal\Core\Entity\EntityListController::buildRow().
    */
-  public function buildRow(EntityViewMode $view_mode) {
+  public function buildRow(EntityInterface $view_mode) {
     $row['name'] = check_plain($view_mode->label());
     $row['operations']['data'] = $this->buildOperations($view_mode);
     $row['operations']['class'] = array('operations');
@@ -82,7 +82,7 @@ public function buildRow(EntityViewMode $view_mode) {
   /**
    * Overrides Drupal\Core\Entity\EntityListController::getOperations().
    */
-  public function getOperations(EntityViewMode $view_mode) {
+  public function getOperations(EntityInterface $view_mode) {
     $operations = parent::getOperations($view_mode);
     // @todo Move this to ConfigEntityBase: http://drupal.org/node/1831928
     if ($view_mode->locked) {
diff --git b/core/modules/file/config/view_mode.file.full.yml a/core/modules/file/config/view_mode.file.full.yml
index 872254e..1136c3a 100644
--- b/core/modules/file/config/view_mode.file.full.yml
+++ a/core/modules/file/config/view_mode.file.full.yml
@@ -1,4 +1,4 @@
-machine_name: file.full
+machineName: file.full
 name: File default
 custom: '0'
 targetEntityType: file