diff --git a/core/modules/node/src/Entity/Node.php b/core/modules/node/src/Entity/Node.php
index 0588ab0..56c8ee0 100644
--- a/core/modules/node/src/Entity/Node.php
+++ b/core/modules/node/src/Entity/Node.php
@@ -31,9 +31,9 @@
  *     "access" = "Drupal\node\NodeAccessControlHandler",
  *     "views_data" = "Drupal\node\NodeViewsData",
  *     "form" = {
- *       "default" = "Drupal\node\NodeForm",
+ *       "default" = "Drupal\node\Form\NodeForm",
  *       "delete" = "Drupal\node\Form\NodeDeleteForm",
- *       "edit" = "Drupal\node\NodeForm"
+ *       "edit" = "Drupal\node\Form\NodeForm"
  *     },
  *     "route_provider" = {
  *       "html" = "Drupal\node\Entity\NodeRouteProvider",
diff --git a/core/modules/node/src/Entity/NodeType.php b/core/modules/node/src/Entity/NodeType.php
index 2867e53..1e81aa5 100644
--- a/core/modules/node/src/Entity/NodeType.php
+++ b/core/modules/node/src/Entity/NodeType.php
@@ -20,8 +20,8 @@
  *   handlers = {
  *     "access" = "Drupal\node\NodeTypeAccessControlHandler",
  *     "form" = {
- *       "add" = "Drupal\node\NodeTypeForm",
- *       "edit" = "Drupal\node\NodeTypeForm",
+ *       "add" = "Drupal\node\Form\NodeTypeForm",
+ *       "edit" = "Drupal\node\Form\NodeTypeForm",
  *       "delete" = "Drupal\node\Form\NodeTypeDeleteConfirm"
  *     },
  *     "list_builder" = "Drupal\node\NodeTypeListBuilder",
diff --git a/core/modules/node/src/NodeForm.php b/core/modules/node/src/Form/NodeForm.php
similarity index 98%
rename from core/modules/node/src/NodeForm.php
rename to core/modules/node/src/Form/NodeForm.php
index 162ba1b..09abfea 100644
--- a/core/modules/node/src/NodeForm.php
+++ b/core/modules/node/src/Form/NodeForm.php
@@ -2,14 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\node\NodeForm.
+ * Contains \Drupal\node\Form\NodeForm.
  */
 
-namespace Drupal\node;
+namespace Drupal\node\Form;
 
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\node\NodeInterface;
 use Drupal\user\Entity\User;
 use Drupal\user\PrivateTempStoreFactory;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -220,7 +221,7 @@ public function form(array $form, FormStateInterface $form_state) {
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
    *
-   * @see \Drupal\node\NodeForm::form()
+   * @see \Drupal\node\Form\NodeForm::form()
    */
   function updateStatus($entity_type_id, NodeInterface $node, array $form, FormStateInterface $form_state) {
     $element = $form_state->getTriggeringElement();
diff --git a/core/modules/node/src/NodeTypeForm.php b/core/modules/node/src/Form/NodeTypeForm.php
similarity index 99%
rename from core/modules/node/src/NodeTypeForm.php
rename to core/modules/node/src/Form/NodeTypeForm.php
index ff757f9..045ccaf 100644
--- a/core/modules/node/src/NodeTypeForm.php
+++ b/core/modules/node/src/Form/NodeTypeForm.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\node\NodeTypeForm.
+ * Contains \Drupal\node\Form\NodeTypeForm.
  */
 
-namespace Drupal\node;
+namespace Drupal\node\Form;
 
 use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Entity\EntityManagerInterface;