diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index 221b921..c2c4f2d 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -215,7 +215,7 @@ function aggregator_menu() {
   $items['aggregator/sources/%aggregator_feed/configure'] = array(
     'title' => 'Configure',
     'page callback' => 'entity_get_form',
-    'page arguments' => array(2),
+    'page arguments' => array(2, 'add'),
     'access arguments' => array('administer news feeds'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 10,
@@ -224,7 +224,7 @@ function aggregator_menu() {
   $items['admin/config/services/aggregator/edit/feed/%aggregator_feed'] = array(
     'title' => 'Edit feed',
     'page callback' => 'entity_get_form',
-    'page arguments' => array(6),
+    'page arguments' => array(6, 'edit'),
     'access arguments' => array('administer news feeds'),
     'file' => 'aggregator.admin.inc',
   );
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Core/Entity/Feed.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Core/Entity/Feed.php
index c6e380a..ffdd2f8 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Core/Entity/Feed.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Core/Entity/Feed.php
@@ -23,7 +23,8 @@
  *     "storage" = "Drupal\aggregator\FeedStorageController",
  *     "render" = "Drupal\aggregator\FeedRenderController",
  *     "form" = {
- *       "add" = "Drupal\aggregator\FeedFormController"
+ *       "add" = "Drupal\aggregator\FeedFormController",
+ *       "edit" = "Drupal\aggregator\FeedFormController"
  *     }
  *   },
  *   base_table = "aggregator_feed",
diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php b/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php
index d3ba0b7..6f70a10 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php
@@ -64,8 +64,8 @@ function testMultiForm() {
     // desired elements.
     $field_name = 'field_ajax_test';
     $field_xpaths = array(
-      'page-node-form' => '//form[@id="page-node-form"]//div[contains(@class, "field-name-field-ajax-test")]',
-      'page-node-form--2' => '//form[@id="page-node-form--2"]//div[contains(@class, "field-name-field-ajax-test")]',
+      'page-node-add-form' => '//form[@id="page-node-add-form"]//div[contains(@class, "field-name-field-ajax-test")]',
+      'page-node-add-form--2' => '//form[@id="page-node-add-form--2"]//div[contains(@class, "field-name-field-ajax-test")]',
     );
     $button_name = $field_name . '_add_more';
     $button_value = t('Add another item');
diff --git a/core/modules/system/tests/modules/form_test/form_test.module b/core/modules/system/tests/modules/form_test/form_test.module
index df9250e..a476429 100644
--- a/core/modules/system/tests/modules/form_test/form_test.module
+++ b/core/modules/system/tests/modules/form_test/form_test.module
@@ -2268,8 +2268,8 @@ function form_test_two_instances() {
     'langcode' => Language::LANGCODE_NOT_SPECIFIED,
   ));
   $node2 = clone($node1);
-  $return['node_form_1'] = entity_get_form($node1, 'edit');
-  $return['node_form_2'] = entity_get_form($node2, 'edit');
+  $return['node_form_1'] = entity_get_form($node1, 'add');
+  $return['node_form_2'] = entity_get_form($node2, 'add');
   return $return;
 }
 
diff --git a/core/modules/translation_entity/translation_entity.pages.inc b/core/modules/translation_entity/translation_entity.pages.inc
index c7de9e2..53dda4f 100644
--- a/core/modules/translation_entity/translation_entity.pages.inc
+++ b/core/modules/translation_entity/translation_entity.pages.inc
@@ -196,7 +196,7 @@ function translation_entity_add_page(EntityInterface $entity, Language $source =
   // @todo Exploit the upcoming hook_entity_prepare() when available.
   translation_entity_prepare_translation($entity, $source, $target);
   $info = $entity->entityInfo();
-  $operation = isset($info['default_operation']) ? $info['default_operation'] : 'default';
+  $operation = isset($info['default_operation']) ? $info['default_operation'] : 'add';
   $form_state['langcode'] = $target->langcode;
   $form_state['translation_entity']['source'] = $source;
   $form_state['translation_entity']['target'] = $target;
@@ -220,7 +220,7 @@ function translation_entity_add_page(EntityInterface $entity, Language $source =
 function translation_entity_edit_page(EntityInterface $entity, Language $language = NULL) {
   $language = !empty($language) ? $language : language(Language::TYPE_CONTENT);
   $info = $entity->entityInfo();
-  $operation = isset($info['default_operation']) ? $info['default_operation'] : 'default';
+  $operation = isset($info['default_operation']) ? $info['default_operation'] : 'edit';
   $form_state['langcode'] = $language->langcode;
   $form_state['translation_entity']['translation_form'] = TRUE;
   return entity_get_form($entity, $operation, $form_state);