diff --git a/core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityFormDisplay.php b/core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityFormDisplay.php
index a3b2903..96964ed 100644
--- a/core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityFormDisplay.php
+++ b/core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityFormDisplay.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\entity\Plugin\Core\Entity;
 
-use Drupal\Component\Annotation\Plugin;
+use Drupal\Core\Entity\Annotation\EntityType;
 use Drupal\Core\Annotation\Translation;
 use Drupal\entity\EntityDisplayBase;
 
@@ -15,7 +15,7 @@
  * Configuration entity that contains widget options for all components of a
  * entity form in a given form mode.
  *
- * @Plugin(
+ * @EntityType(
  *   id = "entity_form_display",
  *   label = @Translation("Entity form display"),
  *   module = "entity",
diff --git a/core/profiles/standard/config/entity.display.node.article.default.yml b/core/profiles/standard/config/entity.display.node.article.default.yml
index 7cd3ae0..330de2d 100644
--- a/core/profiles/standard/config/entity.display.node.article.default.yml
+++ b/core/profiles/standard/config/entity.display.node.article.default.yml
@@ -1,7 +1,7 @@
 id: node.article.default
 targetEntityType: node
 bundle: article
-viewMode: default
+mode: default
 content:
   body:
     label: hidden
diff --git a/core/profiles/standard/config/entity.display.node.article.teaser.yml b/core/profiles/standard/config/entity.display.node.article.teaser.yml
index ae65eb4..44add7e 100644
--- a/core/profiles/standard/config/entity.display.node.article.teaser.yml
+++ b/core/profiles/standard/config/entity.display.node.article.teaser.yml
@@ -1,7 +1,7 @@
 id: node.article.teaser
 targetEntityType: node
 bundle: article
-viewMode: teaser
+mode: teaser
 content:
   body:
     label: hidden
diff --git a/core/profiles/standard/config/entity.form_display.node.article.default.yml b/core/profiles/standard/config/entity.form_display.node.article.default.yml
new file mode 100644
index 0000000..dcd242e
--- /dev/null
+++ b/core/profiles/standard/config/entity.form_display.node.article.default.yml
@@ -0,0 +1,25 @@
+id: node.article.default
+targetEntityType: node
+bundle: article
+mode: default
+content:
+  body:
+    type: text_textarea_with_summary
+    weight: '0'
+    settings:
+      rows: '9'
+      summary_rows: '3'
+      placeholder: ''
+  field_tags:
+    type: taxonomy_autocomplete
+    weight: '-4'
+    settings:
+      size: '60'
+      autocomplete_path: taxonomy/autocomplete
+      placeholder: ''
+  field_image:
+    type: image_image
+    settings:
+      progress_indicator: throbber
+      preview_image_style: thumbnail
+    weight: '-1'