diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 0633f3a..9f2f1e0 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -788,7 +788,7 @@ function comment_node_page_additions(Node $node) {
  */
 function comment_edit($node, $pid = NULL) {
   $values = array('nid' => $node->nid, 'pid' => $pid, 'node_type' => 'comment_node_' . $node->type);
-  return entity_create('comment', $values)->edit();
+  return entity_create('comment', $values)->form();
 }
 
 /**
@@ -1661,7 +1661,7 @@ function comment_get_display_page($cid, $node_type) {
  */
 function comment_edit_page(Comment $comment) {
   drupal_set_title(t('Edit comment %comment', array('%comment' => $comment->subject)), PASS_THROUGH);
-  return $comment->edit();
+  return $comment->form();
 }
 
 /**
diff --git a/core/modules/entity/entity.module b/core/modules/entity/entity.module
index 2ba0630..e6ed304 100644
--- a/core/modules/entity/entity.module
+++ b/core/modules/entity/entity.module
@@ -514,7 +514,7 @@ function _entity_form_id(EntityInterface $entity) {
  * @return
  *   A rendered edit form for the given entity.
  */
-function entity_edit($entity, $context = 'default') {
+function entity_get_form($entity, $context = 'default') {
   if (is_string($entity)) {
     $entity = entity_create($entity, array());
   }
diff --git a/core/modules/entity/lib/Drupal/entity/Entity.php b/core/modules/entity/lib/Drupal/entity/Entity.php
index 6b6a7f0..22dde0b 100644
--- a/core/modules/entity/lib/Drupal/entity/Entity.php
+++ b/core/modules/entity/lib/Drupal/entity/Entity.php
@@ -256,7 +256,7 @@ class Entity implements EntityInterface {
    * @param $context
    *   (optional) The context for the form to be returned.
    */
-  public function edit($context = 'default') {
-    return entity_edit($this, $context);
+  public function form($context = 'default') {
+    return entity_get_form($this, $context);
   }
 }
diff --git a/core/modules/entity/lib/Drupal/entity/EntityInterface.php b/core/modules/entity/lib/Drupal/entity/EntityInterface.php
index 619e331..4b2c092 100644
--- a/core/modules/entity/lib/Drupal/entity/EntityInterface.php
+++ b/core/modules/entity/lib/Drupal/entity/EntityInterface.php
@@ -188,5 +188,5 @@ interface EntityInterface {
    *
    * @param $context
    */
-  public function edit($context = 'default');
+  public function form($context = 'default');
 }
diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc
index 8068cab..3025faa 100644
--- a/core/modules/node/node.pages.inc
+++ b/core/modules/node/node.pages.inc
@@ -19,7 +19,7 @@ use Drupal\node\Node;
 function node_page_edit($node) {
   $type_name = node_type_get_name($node);
   drupal_set_title(t('<em>Edit @type</em> @title', array('@type' => $type_name, '@title' => $node->title)), PASS_THROUGH);
-  return $node->edit();
+  return $node->form();
 }
 
 /**
@@ -94,7 +94,7 @@ function node_add($type) {
     'langcode' => LANGUAGE_NOT_SPECIFIED,
   ));
   drupal_set_title(t('Create @name', array('@name' => $types[$type]->name)), PASS_THROUGH);
-  $output = $node->edit();
+  $output = $node->form();
 
   return $output;
 }
diff --git a/core/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc
index 460074f..003218a 100644
--- a/core/modules/taxonomy/taxonomy.admin.inc
+++ b/core/modules/taxonomy/taxonomy.admin.inc
@@ -647,7 +647,7 @@ function theme_taxonomy_overview_terms($variables) {
  */
 function taxonomy_term_add($vocabulary) {
   $term = entity_create('taxonomy_term', array('vid' => $vocabulary->vid, 'vocabulary_machine_name' => $vocabulary->machine_name));
-  return $term->edit();
+  return $term->form();
 }
 
 /**
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index cdd5917..28dd63b 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -299,7 +299,7 @@ function taxonomy_menu() {
   );
   $items['admin/structure/taxonomy/add'] = array(
     'title' => 'Add vocabulary',
-    'page callback' => 'entity_edit',
+    'page callback' => 'entity_get_form',
     'page arguments' => array('taxonomy_vocabulary'),
     'access arguments' => array('administer taxonomy'),
     'type' => MENU_LOCAL_ACTION,
@@ -321,7 +321,7 @@ function taxonomy_menu() {
   );
   $items['taxonomy/term/%taxonomy_term/edit'] = array(
     'title' => 'Edit',
-    'page callback' => 'entity_edit',
+    'page callback' => 'entity_get_form',
     // Pass a NULL argument to ensure that additional path components are not
     // passed to taxonomy_form_term() as the vocabulary machine name argument.
     'page arguments' => array(2),
@@ -374,7 +374,7 @@ function taxonomy_menu() {
   );
   $items['admin/structure/taxonomy/%taxonomy_vocabulary_machine_name/edit'] = array(
     'title' => 'Edit',
-    'page callback' => 'entity_edit',
+    'page callback' => 'entity_get_form',
     'page arguments' => array(3),
     'access arguments' => array('administer taxonomy'),
     'type' => MENU_LOCAL_TASK,
diff --git a/core/modules/user/user.admin.inc b/core/modules/user/user.admin.inc
index 41793cd..435df41 100644
--- a/core/modules/user/user.admin.inc
+++ b/core/modules/user/user.admin.inc
@@ -11,7 +11,7 @@ function user_admin($callback_arg = '') {
   switch ($op) {
     case t('Create new account'):
     case 'create':
-      $build['user_register'] = entity_edit('user', 'register');
+      $build['user_register'] = entity_get_form('user', 'register');
       break;
     default:
       if (!empty($_POST['accounts']) && isset($_POST['operation']) && ($_POST['operation'] == 'cancel')) {
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index c814c52..aa61ac8 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1492,7 +1492,7 @@ function user_menu() {
 
   $items['user/register'] = array(
     'title' => 'Create new account',
-    'page callback' => 'entity_edit',
+    'page callback' => 'entity_get_form',
     'page arguments' => array('user', 'register'),
     'access callback' => 'user_register_access',
     'type' => MENU_LOCAL_TASK,
@@ -1659,7 +1659,7 @@ function user_menu() {
 
   $items['user/%user/edit'] = array(
     'title' => 'Edit',
-    'page callback' => 'entity_edit',
+    'page callback' => 'entity_get_form',
     'page arguments' => array(1),
     'access callback' => 'user_edit_access',
     'access arguments' => array(1),