diff --git a/core/lib/Drupal/Component/Annotation/composer.json b/core/lib/Drupal/Component/Annotation/composer.json
index 76254ea..cae468a 100644
--- a/core/lib/Drupal/Component/Annotation/composer.json
+++ b/core/lib/Drupal/Component/Annotation/composer.json
@@ -6,9 +6,9 @@
   "license": "GPL-2.0+",
   "require": {
     "php": ">=5.5.9",
-    "doctrine/common": "2.5.*",
+    "doctrine/common": "^2.5",
     "doctrine/annotations": "1.2.*",
-    "drupal/core-fileCache": "~8.2",
+    "drupal/core-file-cache": "~8.2",
     "drupal/core-plugin": "~8.2",
     "drupal/core-utility": "~8.2"
   },
diff --git a/core/lib/Drupal/Component/ClassFinder/composer.json b/core/lib/Drupal/Component/ClassFinder/composer.json
index 97d3668..c7e7397 100644
--- a/core/lib/Drupal/Component/ClassFinder/composer.json
+++ b/core/lib/Drupal/Component/ClassFinder/composer.json
@@ -6,7 +6,7 @@
   "license": "GPL-2.0+",
   "require": {
     "php": ">=5.5.9",
-    "doctrine/common": "2.5.*"
+    "doctrine/common": "^2.5"
   },
   "autoload": {
     "psr-4": {
diff --git a/core/lib/Drupal/Component/Diff/composer.json b/core/lib/Drupal/Component/Diff/composer.json
index 0d7f3d3..1f6c4e3 100644
--- a/core/lib/Drupal/Component/Diff/composer.json
+++ b/core/lib/Drupal/Component/Diff/composer.json
@@ -6,7 +6,7 @@
   "license": "GPL-2.0+",
   "require": {
     "php": ">=5.5.9",
-    "drupal/utility": "~8.2"
+    "drupal/core-utility": "~8.2"
   },
   "autoload": {
     "psr-4": {
diff --git a/core/lib/Drupal/Component/Discovery/composer.json b/core/lib/Drupal/Component/Discovery/composer.json
index 1b0acb6..3256a95 100644
--- a/core/lib/Drupal/Component/Discovery/composer.json
+++ b/core/lib/Drupal/Component/Discovery/composer.json
@@ -6,7 +6,7 @@
   "license": "GPL-2.0+",
   "require": {
     "php": ">=5.5.9",
-    "drupal/core-filecache": "~8.2",
+    "drupal/core-file-cache": "~8.2",
     "drupal/core-serialization": "~8.2"
   },
   "autoload": {
diff --git a/core/tests/Drupal/Tests/ComposerIntegrationTest.php b/core/tests/Drupal/Tests/ComposerIntegrationTest.php
index a64804c..0043f72 100644
--- a/core/tests/Drupal/Tests/ComposerIntegrationTest.php
+++ b/core/tests/Drupal/Tests/ComposerIntegrationTest.php
@@ -47,6 +47,7 @@ protected function getPaths() {
       $this->root . '/core/lib/Drupal/Component/Annotation',
       $this->root . '/core/lib/Drupal/Component/Assertion',
       $this->root . '/core/lib/Drupal/Component/Bridge',
+      $this->root . '/core/lib/Drupal/Component/ClassFinder',
       $this->root . '/core/lib/Drupal/Component/Datetime',
       $this->root . '/core/lib/Drupal/Component/DependencyInjection',
       $this->root . '/core/lib/Drupal/Component/Diff',