diff --git a/core/modules/field/modules/email/email.info b/core/modules/field/modules/email/email.info
index 5c3d3ff..25ffa1b 100644
--- a/core/modules/field/modules/email/email.info
+++ b/core/modules/field/modules/email/email.info
@@ -1,6 +1,6 @@
 name = E-mail
 description = Defines a field type for e-mail addresses.
-package = Core
+package = Field
 version = VERSION
 core = 8.x
 dependencies[] = field
diff --git a/core/modules/field/modules/link/link.info b/core/modules/field/modules/link/link.info
index a43c222..c8e16fc 100644
--- a/core/modules/field/modules/link/link.info
+++ b/core/modules/field/modules/link/link.info
@@ -1,6 +1,6 @@
 name = Link
 description = Provides a simple link field type.
 core = 8.x
-package = Core
+package = Field
 version = VERSION
 dependencies[] = field
diff --git a/core/modules/field/modules/number/number.info b/core/modules/field/modules/number/number.info
index aabe3d7..1c7b5a3 100644
--- a/core/modules/field/modules/number/number.info
+++ b/core/modules/field/modules/number/number.info
@@ -1,6 +1,6 @@
 name = Number
 description = Defines numeric field types.
-package = Core
+package = Field
 version = VERSION
 core = 8.x
 dependencies[] = field
diff --git a/core/modules/field/modules/options/options.info b/core/modules/field/modules/options/options.info
index f19e952..1eba861 100644
--- a/core/modules/field/modules/options/options.info
+++ b/core/modules/field/modules/options/options.info
@@ -1,6 +1,6 @@
 name = Options
 description = Defines selection, check box and radio button widgets for text and numeric fields.
-package = Core
+package = Field
 version = VERSION
 core = 8.x
 dependencies[] = field
diff --git a/core/modules/field/modules/text/text.info b/core/modules/field/modules/text/text.info
index 3ba8357..ae6abac 100644
--- a/core/modules/field/modules/text/text.info
+++ b/core/modules/field/modules/text/text.info
@@ -1,6 +1,6 @@
 name = Text
 description = Defines simple text field types.
-package = Core
+package = Field
 version = VERSION
 core = 8.x
 dependencies[] = field
diff --git a/core/modules/file/file.info b/core/modules/file/file.info
index dc93ab0..47b0d8e 100644
--- a/core/modules/file/file.info
+++ b/core/modules/file/file.info
@@ -1,6 +1,6 @@
 name = File
 description = Defines a file field type.
-package = Core
+package = Field
 version = VERSION
 core = 8.x
 dependencies[] = field
diff --git a/core/modules/image/image.info b/core/modules/image/image.info
index a63fbf5..29c2fbf 100644
--- a/core/modules/image/image.info
+++ b/core/modules/image/image.info
@@ -1,6 +1,6 @@
 name = Image
 description = Provides image manipulation tools.
-package = Core
+package = Field
 version = VERSION
 core = 8.x
 dependencies[] = file
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php
index c53d225..8c85df0 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php
@@ -147,8 +147,8 @@ function testModuleEnableOrder() {
     $this->drupalPost('admin/modules', $edit, t('Save configuration'));
     $this->assertModules(array('forum'), FALSE);
     $this->assertText(t('You must enable the Taxonomy, Options, Comment, Poll, PHP Filter modules to install Forum.'));
-    $edit['modules[Core][options][enable]'] = 'options';
-    $edit['modules[Core][taxonomy][enable]'] = 'taxonomy';
+    $edit['modules[Field][options][enable]'] = 'options';
+    $edit['modules[Field][taxonomy][enable]'] = 'taxonomy';
     $edit['modules[Core][comment][enable]'] = 'comment';
     $edit['modules[Core][poll][enable]'] = 'poll';
     $edit['modules[Core][php][enable]'] = 'php';
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/EnableDisableTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/EnableDisableTest.php
index f691e7a..c61b310 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Module/EnableDisableTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Module/EnableDisableTest.php
@@ -27,7 +27,7 @@ function testEnableDisable() {
     // hidden or required.
     $modules = system_rebuild_module_data();
     foreach ($modules as $name => $module) {
-      if ($module->info['package'] != 'Core' || !empty($module->info['hidden']) || !empty($module->info['required'])) {
+      if (($module->info['package'] != 'Core' && $module->info['package'] != 'Field') || !empty($module->info['hidden']) || !empty($module->info['required'])) {
         unset($modules[$name]);
       }
     }
@@ -43,7 +43,7 @@ function testEnableDisable() {
       // Exclude required modules. Only installation profile "suggestions" can
       // be disabled and uninstalled.
       if (isset($modules[$dependency])) {
-        $automatically_enabled[$dependency] = TRUE;
+        $automatically_enabled[$dependency] = $modules[$dependency]->info['package'];
       }
     }
 
@@ -65,6 +65,7 @@ function testEnableDisable() {
     // Go through each module in the list and try to enable it (unless it was
     // already enabled automatically due to a dependency).
     foreach ($modules as $name => $module) {
+      $package = $module->info['package'];
       if (empty($automatically_enabled[$name])) {
         // Start a list of modules that we expect to be enabled this time.
         $modules_to_enable = array($name);
@@ -75,7 +76,7 @@ function testEnableDisable() {
         foreach (array_keys($module->requires) as $dependency) {
           if (isset($modules[$dependency]) && empty($automatically_enabled[$dependency])) {
             $modules_to_enable[] = $dependency;
-            $automatically_enabled[$dependency] = TRUE;
+            $automatically_enabled[$dependency] = $modules[$dependency]->info['package'];
           }
         }
 
@@ -88,7 +89,7 @@ function testEnableDisable() {
 
         // Install and enable the module.
         $edit = array();
-        $edit['modules[Core][' . $name . '][enable]'] = $name;
+        $edit['modules[' . $package . '][' . $name . '][enable]'] = $name;
         $this->drupalPost('admin/modules', $edit, t('Save configuration'));
         // Handle the case where modules were installed along with this one and
         // where we therefore hit a confirmation screen.
@@ -117,7 +118,7 @@ function testEnableDisable() {
         // for the dblog module, because that is needed for the test; we'll go
         // back and do that one at the end also.
         if ($name != 'dblog') {
-          $this->assertSuccessfulDisableAndUninstall($name);
+          $this->assertSuccessfulDisableAndUninstall($name, $package);
         }
       }
     }
@@ -126,14 +127,14 @@ function testEnableDisable() {
     // disable and uninstall them one by one.
     while (!empty($automatically_enabled)) {
       $initial_count = count($automatically_enabled);
-      foreach (array_keys($automatically_enabled) as $name) {
+      foreach ($automatically_enabled as $name => $package) {
         // If the module can't be disabled due to dependencies, skip it and try
         // again the next time. Otherwise, try to disable it.
         $this->drupalGet('admin/modules');
-        $disabled_checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[Core][' . $name . '][enable]"]');
+        $disabled_checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[' . $package . '][' . $name . '][enable]"]');
         if (empty($disabled_checkbox) && $name != 'dblog') {
           unset($automatically_enabled[$name]);
-          $this->assertSuccessfulDisableAndUninstall($name);
+          $this->assertSuccessfulDisableAndUninstall($name, $package);
         }
       }
       $final_count = count($automatically_enabled);
@@ -148,7 +149,7 @@ function testEnableDisable() {
     // Disable and uninstall the dblog module last, since we needed it for
     // assertions in all the above tests.
     if (isset($modules['dblog'])) {
-      $this->assertSuccessfulDisableAndUninstall('dblog');
+      $this->assertSuccessfulDisableAndUninstall('dblog', 'Core');
     }
 
     // Now that all modules have been tested, go back and try to enable them
@@ -158,8 +159,8 @@ function testEnableDisable() {
     // - That enabling more than one module at the same time does not lead to
     //   any errors.
     $edit = array();
-    foreach (array_keys($modules) as $name) {
-      $edit['modules[Core][' . $name . '][enable]'] = $name;
+    foreach ($modules as $name => $module) {
+      $edit['modules[' . $module->info['package'] . '][' . $name . '][enable]'] = $name;
     }
     $this->drupalPost('admin/modules', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'), 'Modules status has been updated.');
@@ -170,11 +171,13 @@ function testEnableDisable() {
    *
    * @param string $module
    *   The name of the module to disable and uninstall.
+   * @param string $package
+   *   The name of the package in which the module is located.
    */
-  function assertSuccessfulDisableAndUninstall($module) {
+  function assertSuccessfulDisableAndUninstall($module, $package) {
     // Disable the module.
     $edit = array();
-    $edit['modules[Core][' . $module . '][enable]'] = FALSE;
+    $edit['modules[' . $package . '][' . $module . '][enable]'] = FALSE;
     $this->drupalPost('admin/modules', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'), 'Modules status has been updated.');
     $this->assertModules(array($module), FALSE);
diff --git a/core/modules/taxonomy/taxonomy.info b/core/modules/taxonomy/taxonomy.info
index 837b556..095fcd1 100644
--- a/core/modules/taxonomy/taxonomy.info
+++ b/core/modules/taxonomy/taxonomy.info
@@ -1,6 +1,6 @@
 name = Taxonomy
 description = Enables the categorization of content.
-package = Core
+package = Field
 version = VERSION
 core = 8.x
 dependencies[] = options
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php b/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php
index 2455b10..ee21203 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php
@@ -78,7 +78,7 @@ function testAdministratorRole() {
     $edit = array();
     $edit['modules[Core][aggregator][enable]'] = TRUE;
     // Aggregator depends on file module, enable that as well.
-    $edit['modules[Core][file][enable]'] = TRUE;
+    $edit['modules[Field][file][enable]'] = TRUE;
     $this->drupalPost('admin/modules', $edit, t('Save configuration'));
     $this->assertTrue(user_access('administer news feeds', $this->admin_user), 'The permission was automatically assigned to the administrator role');
   }