diff --git a/core/modules/action/lib/Drupal/action/Tests/ActionUninstallTest.php b/core/modules/action/lib/Drupal/action/Tests/ActionUninstallTest.php
new file mode 100644
index 0000000..01b125d
--- /dev/null
+++ b/core/modules/action/lib/Drupal/action/Tests/ActionUninstallTest.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\action\Tests\ActionUninstallTest.
+ */
+
+namespace Drupal\action\Tests;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests action uninstallation.
+ *
+ * @see \Drupal\action\Plugin\views\field\BulkForm
+ */
+class ActionUninstallTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('views', 'action');
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Uninstall action test',
+      'description' => 'Tests that uninstalling actions does not remove other module\'s actions.',
+      'group' => 'Action',
+    );
+  }
+
+  /**
+   * Tests Action uninstall.
+   */
+  public function testActionUninstall() {
+    \Drupal::moduleHandler()->disable(array('action'));
+    \Drupal::moduleHandler()->uninstall(array('action'));
+
+    $this->assertTrue(entity_load('action', 'user_block_user_action', TRUE), 'Configuration entity \'user_block_user_action\' still exists after uninstalling action module.' );
+
+    $admin_user = $this->drupalCreateUser(array('administer users'));
+    $this->drupalLogin($admin_user);
+
+    $this->drupalGet('admin/people');
+    // Ensure we have the user_block_user_action listed.
+    $this->assertRaw('<option value="user_block_user_action">Block the selected user(s)</option>');
+
+  }
+
+}
diff --git a/core/modules/comment/config/action.action.comment_publish_action.yml b/core/modules/comment/config/system.action.comment_publish_action.yml
similarity index 100%
rename from core/modules/comment/config/action.action.comment_publish_action.yml
rename to core/modules/comment/config/system.action.comment_publish_action.yml
diff --git a/core/modules/comment/config/action.action.comment_save_action.yml b/core/modules/comment/config/system.action.comment_save_action.yml
similarity index 100%
rename from core/modules/comment/config/action.action.comment_save_action.yml
rename to core/modules/comment/config/system.action.comment_save_action.yml
diff --git a/core/modules/comment/config/action.action.comment_unpublish_action.yml b/core/modules/comment/config/system.action.comment_unpublish_action.yml
similarity index 100%
rename from core/modules/comment/config/action.action.comment_unpublish_action.yml
rename to core/modules/comment/config/system.action.comment_unpublish_action.yml
diff --git a/core/modules/node/config/action.action.node_delete_action.yml b/core/modules/node/config/system.action.node_delete_action.yml
similarity index 100%
rename from core/modules/node/config/action.action.node_delete_action.yml
rename to core/modules/node/config/system.action.node_delete_action.yml
diff --git a/core/modules/node/config/action.action.node_make_sticky_action.yml b/core/modules/node/config/system.action.node_make_sticky_action.yml
similarity index 100%
rename from core/modules/node/config/action.action.node_make_sticky_action.yml
rename to core/modules/node/config/system.action.node_make_sticky_action.yml
diff --git a/core/modules/node/config/action.action.node_make_unsticky_action.yml b/core/modules/node/config/system.action.node_make_unsticky_action.yml
similarity index 100%
rename from core/modules/node/config/action.action.node_make_unsticky_action.yml
rename to core/modules/node/config/system.action.node_make_unsticky_action.yml
diff --git a/core/modules/node/config/action.action.node_promote_action.yml b/core/modules/node/config/system.action.node_promote_action.yml
similarity index 100%
rename from core/modules/node/config/action.action.node_promote_action.yml
rename to core/modules/node/config/system.action.node_promote_action.yml
diff --git a/core/modules/node/config/action.action.node_publish_action.yml b/core/modules/node/config/system.action.node_publish_action.yml
similarity index 100%
rename from core/modules/node/config/action.action.node_publish_action.yml
rename to core/modules/node/config/system.action.node_publish_action.yml
diff --git a/core/modules/node/config/action.action.node_save_action.yml b/core/modules/node/config/system.action.node_save_action.yml
similarity index 100%
rename from core/modules/node/config/action.action.node_save_action.yml
rename to core/modules/node/config/system.action.node_save_action.yml
diff --git a/core/modules/node/config/action.action.node_unpromote_action.yml b/core/modules/node/config/system.action.node_unpromote_action.yml
similarity index 100%
rename from core/modules/node/config/action.action.node_unpromote_action.yml
rename to core/modules/node/config/system.action.node_unpromote_action.yml
diff --git a/core/modules/node/config/action.action.node_unpublish_action.yml b/core/modules/node/config/system.action.node_unpublish_action.yml
similarity index 100%
rename from core/modules/node/config/action.action.node_unpublish_action.yml
rename to core/modules/node/config/system.action.node_unpublish_action.yml
diff --git a/core/modules/system/lib/Drupal/system/Entity/Action.php b/core/modules/system/lib/Drupal/system/Entity/Action.php
index 5e3b575..c390a76 100644
--- a/core/modules/system/lib/Drupal/system/Entity/Action.php
+++ b/core/modules/system/lib/Drupal/system/Entity/Action.php
@@ -26,7 +26,7 @@
  *     "storage" = "Drupal\Core\Config\Entity\ConfigStorageController",
  *     "access" = "Drupal\action\ActionAccessController"
  *   },
- *   config_prefix = "action.action",
+ *   config_prefix = "system.action",
  *   entity_keys = {
  *     "id" = "id",
  *     "label" = "label",
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 9dc4b5e..447320c 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -2198,7 +2198,7 @@ function system_update_8057() {
         $action['aid'] = $action['callback'] . '_' . $action['aid'];
       }
       $configuration = unserialize($action['parameters']) ?: array();
-      Drupal::config('action.action.' . $action['aid'])
+      Drupal::config('system.action.' . $action['aid'])
         ->set('id', $action['aid'])
         ->set('label', $action['label'])
         ->set('status', '1')
diff --git a/core/modules/user/config/action.action.user_block_user_action.yml b/core/modules/user/config/system.action.user_block_user_action.yml
similarity index 100%
rename from core/modules/user/config/action.action.user_block_user_action.yml
rename to core/modules/user/config/system.action.user_block_user_action.yml
diff --git a/core/modules/user/config/action.action.user_cancel_user_action.yml b/core/modules/user/config/system.action.user_cancel_user_action.yml
similarity index 100%
rename from core/modules/user/config/action.action.user_cancel_user_action.yml
rename to core/modules/user/config/system.action.user_cancel_user_action.yml
diff --git a/core/modules/user/config/action.action.user_unblock_user_action.yml b/core/modules/user/config/system.action.user_unblock_user_action.yml
similarity index 100%
rename from core/modules/user/config/action.action.user_unblock_user_action.yml
rename to core/modules/user/config/system.action.user_unblock_user_action.yml