diff --git a/core/modules/action/action.module b/core/modules/action/action.module
index 7461302..cc83bc2 100644
--- a/core/modules/action/action.module
+++ b/core/modules/action/action.module
@@ -40,8 +40,8 @@ function action_help($route_name, RouteMatchInterface $route_match) {
 function action_entity_type_build(array &$entity_types) {
   /** @var $entity_types \Drupal\Core\Entity\EntityTypeInterface[] */
   $entity_types['action']
-    ->setFormClass('add', 'Drupal\action\ActionAddForm')
-    ->setFormClass('edit', 'Drupal\action\ActionEditForm')
+    ->setFormClass('add', 'Drupal\action\Form\ActionAddForm')
+    ->setFormClass('edit', 'Drupal\action\Form\ActionEditForm')
     ->setFormClass('delete', 'Drupal\action\Form\ActionDeleteForm')
     ->setListBuilderClass('Drupal\action\ActionListBuilder')
     ->setLinkTemplate('delete-form', '/admin/config/system/actions/configure/{action}/delete')
diff --git a/core/modules/action/src/ActionAddForm.php b/core/modules/action/src/Form/ActionAddForm.php
similarity index 98%
rename from core/modules/action/src/ActionAddForm.php
rename to core/modules/action/src/Form/ActionAddForm.php
index 25aaebc..8f062cd 100644
--- a/core/modules/action/src/ActionAddForm.php
+++ b/core/modules/action/src/Form/ActionAddForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\action;
+namespace Drupal\action\Form;
 
 use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Action\ActionManager;
diff --git a/core/modules/action/src/ActionEditForm.php b/core/modules/action/src/Form/ActionEditForm.php
similarity index 78%
rename from core/modules/action/src/ActionEditForm.php
rename to core/modules/action/src/Form/ActionEditForm.php
index 8053605..854cb9c 100644
--- a/core/modules/action/src/ActionEditForm.php
+++ b/core/modules/action/src/Form/ActionEditForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\action;
+namespace Drupal\action\Form;
 
 /**
  * Provides a form for action edit forms.
diff --git a/core/modules/action/src/ActionFormBase.php b/core/modules/action/src/Form/ActionFormBase.php
similarity index 99%
rename from core/modules/action/src/ActionFormBase.php
rename to core/modules/action/src/Form/ActionFormBase.php
index 7a5746a..5a99b7f 100644
--- a/core/modules/action/src/ActionFormBase.php
+++ b/core/modules/action/src/Form/ActionFormBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\action;
+namespace Drupal\action\Form;
 
 use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Entity\EntityStorageInterface;