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/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