diff --git a/core/modules/entity_ui/entity_ui.module b/core/modules/entity_ui/entity_ui.module
index ff25f50..a322f48 100644
--- a/core/modules/entity_ui/entity_ui.module
+++ b/core/modules/entity_ui/entity_ui.module
@@ -47,13 +47,13 @@ function entity_ui_menu() {
     'access arguments' => array('administer view modes'),
     'file' => 'entity_ui.admin.inc',
   );
-  $items['admin/config/system/view-modes/%entity_ui_view_mode/edit'] = array(
+  $items['admin/config/system/view-modes/%view_mode/edit'] = array(
     'title' => 'Edit view mode',
     'page callback' => 'entity_get_form',
     'page arguments' => array(4),
     'access arguments' => array('administer view modes'),
   );
-  $items['admin/config/system/view-modes/%entity_ui_view_mode/delete'] = array(
+  $items['admin/config/system/view-modes/%view_mode/delete'] = array(
     'title' => 'Delete view mode',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('entity_ui_view_mode_delete_form', 4),
@@ -67,7 +67,7 @@ function entity_ui_menu() {
 /**
  * Loads a custom view mode by machine name.
  */
-function entity_ui_view_mode_load($machine_name) {
+function view_mode_load($machine_name) {
   return entity_load('view_mode', $machine_name);
 }