diff --git a/core/lib/Drupal/Core/Extension/ModuleHandler.php b/core/lib/Drupal/Core/Extension/ModuleHandler.php
index 81c768f..05f1e4f 100644
--- a/core/lib/Drupal/Core/Extension/ModuleHandler.php
+++ b/core/lib/Drupal/Core/Extension/ModuleHandler.php
@@ -676,7 +676,7 @@ public static function parseDependency($dependency) {
     $p_core = '(?:' . preg_quote(\Drupal::CORE_COMPATIBILITY) . '-)?';
     $p_major = '(?<major>\d+)';
     // By setting the minor version to x, branches can be matched.
-    $p_minor = '(?<minor>(?:\d+|x)(?:-([A-Za-z]+\d+|unstable))?)';
+    $p_minor = '(?<minor>(?:\d+|x)(?:-[A-Za-z]+\d+)?)';
     $parts = explode('(', $dependency, 2);
     $value['name'] = trim($parts[0]);
     if (isset($parts[1])) {
diff --git a/core/modules/big_pipe/big_pipe.info.yml b/core/modules/big_pipe/big_pipe.info.yml
index 73528f2..364d6ca 100644
--- a/core/modules/big_pipe/big_pipe.info.yml
+++ b/core/modules/big_pipe/big_pipe.info.yml
@@ -2,5 +2,5 @@ name: BigPipe
 type: module
 description: 'Sends pages in a way that allows browsers to show them much faster. Uses the BigPipe technique.'
 package: Core (Experimental)
-version: 8.x-0.x-alpha1
+version: 8.x-2.0-alpha1
 core: 8.x
diff --git a/core/modules/inline_form_errors/inline_form_errors.info.yml b/core/modules/inline_form_errors/inline_form_errors.info.yml
index 8e9f3bd..bb1f07f 100644
--- a/core/modules/inline_form_errors/inline_form_errors.info.yml
+++ b/core/modules/inline_form_errors/inline_form_errors.info.yml
@@ -1,6 +1,6 @@
 type: module
 name: Inline Form Errors
 description: 'Enabling inline form errors improves accessibility of web forms errors so that they meet WCAG 2.0 requirements. Unfortunately, some functionality within Forms API may not work as desired.'
-version: 8.x-0.x-alpha1
+version: 8.x-0.0-alpha1
 core: 8.x
 package: Core (Experimental)
diff --git a/core/modules/migrate/migrate.info.yml b/core/modules/migrate/migrate.info.yml
index 55a93ab..c095c28 100644
--- a/core/modules/migrate/migrate.info.yml
+++ b/core/modules/migrate/migrate.info.yml
@@ -2,5 +2,5 @@ name: Migrate
 type: module
 description: 'Handles migrations'
 package: Core (Experimental)
-version: 8.x-0.x-alpha1
+version: 8.x-0.0-alpha1
 core: 8.x
diff --git a/core/modules/migrate_drupal/migrate_drupal.info.yml b/core/modules/migrate_drupal/migrate_drupal.info.yml
index e2dc84b..3ca5510 100644
--- a/core/modules/migrate_drupal/migrate_drupal.info.yml
+++ b/core/modules/migrate_drupal/migrate_drupal.info.yml
@@ -2,7 +2,7 @@ name: Migrate Drupal
 type: module
 description: 'Contains migrations from older Drupal versions.'
 package: Core (Experimental)
-version: 8.x-0.x-alpha1
+version: 8.x-0.0-alpha1
 core: 8.x
 dependencies:
   - migrate
diff --git a/core/modules/system/tests/modules/experimental_module_test/experimental_module_test.info.yml b/core/modules/system/tests/modules/experimental_module_test/experimental_module_test.info.yml
index 3f8687e..096f892 100644
--- a/core/modules/system/tests/modules/experimental_module_test/experimental_module_test.info.yml
+++ b/core/modules/system/tests/modules/experimental_module_test/experimental_module_test.info.yml
@@ -2,5 +2,5 @@ name: 'Experimental Test'
 type: module
 description: 'Module in the experimental package to test experimental functionality.'
 package: Core (Experimental)
-version: 8.x-0.x-unstable
+version: 8.x-0.0-alpha1
 core: 8.x
diff --git a/core/tests/Drupal/KernelTests/Core/Common/DrupalCheckIncompatibilityTest.php b/core/tests/Drupal/KernelTests/Core/Common/DrupalCheckIncompatibilityTest.php
index 4814cd0..b697fd4 100644
--- a/core/tests/Drupal/KernelTests/Core/Common/DrupalCheckIncompatibilityTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Common/DrupalCheckIncompatibilityTest.php
@@ -41,22 +41,21 @@ public function DrupalCheckIncompatibilityProvider() {
     // A NULL expected return value indicates that the dependency has been met
     // and module is compatible.
     return [
-      ['drupal_migrate_ui(>=8.x-0.x-alpha1)', '8.x-0.x-unstable', ' (>=8.x-0.x-alpha1)'],
-      ['drupal_migrate_ui(>=8.x-0.x-unstable)', '8.x-0.x-unstable', NULL],
-      ['drupal_migrate_ui(>=8.x-0.x-alpha1)', '8.x-0.x-alpha1', NULL],
-      ['drupal_migrate_ui(<8.x-0.x-alpha1)', '8.x-0.x-alpha1', ' (<8.x-0.x-alpha1)'],
-      ['drupal_migrate_ui(>8.x-0.x-alpha1)', '8.x-0.x-alpha2', NULL],
-      ['drupal_migrate_ui(>8.x-0.x-alpha2)', '8.x-0.x-beta1', NULL],
-      ['drupal_migrate_ui(>=8.1.x)', '8.x-0.x-beta1', ' (>=8.1.x)'],
+      ['drupal_migrate_ui(>=8.x-0.x-alpha1)', '8.x-0.0-alpha1', NULL],
+      ['drupal_migrate_ui(<8.x-0.x-alpha1)', '8.x-0.0-alpha1', ' (<8.x-0.x-alpha1)'],
+      ['drupal_migrate_ui(>8.x-0.x-alpha1)', '8.x-0.0-alpha2', NULL],
+      ['drupal_migrate_ui(>8.x-0.x-alpha2)', '8.x-0.0-beta1', NULL],
+      ['drupal_migrate_ui(>=8.1.x)', '8.x-0.0-beta1', ' (>=8.1.x)'],
       // Check that dependencies still work after an experimental module has
       // become part of core and therefore gets core's version number.
-      ['drupal_migrate_ui(>8.x-0.x-alpha1)', '8.1.x-dev', NULL],
-      ['drupal_migrate_ui(<8.x-0.x-alpha1)', '8.1.x-dev', ' (<8.x-0.x-alpha1)'],
-      ['drupal_migrate_ui(>=8.x-0.x-unstable)', '8.1.x-dev', NULL],
+      ['drupal_migrate_ui(>8.x-0.0-alpha1)', '8.1.x-dev', NULL],
+      ['drupal_migrate_ui(<8.x-0.0-alpha1)', '8.1.x-dev', ' (<8.x-0.0-alpha1)'],
       // A very odd test to show how fragile the current dependency checking is.
       // This will pass but in reality this will never happen because a module's
       // core dependency would be checked before this.
       ['drupal_migrate_ui(>8.x-0.x-alpha1)', '3.1.x-dev', NULL],
+      // The situation for Big Pipe when it was included in core.
+      ['big_pipe(>=8.x-1.0-rc1)', '8.x-2.0-alpha1', NULL],
     ];
   }
 
diff --git a/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php b/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php
index 83107d7..11f22f0 100644
--- a/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php
+++ b/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php
@@ -506,12 +506,11 @@ public function dependencyProvider() {
       array('views_ui(>8.x-1.x)', array('name' => 'views_ui', 'original_version' => ' (>8.x-1.x)', 'versions' => array(array('op' => '>', 'version' => '2.x')))),
       array('drupal:views_ui(>8.x-1.x)', array('project' => 'drupal', 'name' => 'views_ui', 'original_version' => ' (>8.x-1.x)', 'versions' => array(array('op' => '>', 'version' => '2.x')))),
       // Experimental core modules.
-      array('drupal_migrate_ui(>8.x-0.x-alpha1)', array('name' => 'drupal_migrate_ui', 'original_version' => ' (>8.x-0.x-alpha1)', 'versions' => array(array('op' => '>', 'version' => '0.x-alpha1')))),
-      array('drupal_migrate_ui(<=8.x-0.x-alpha1)', array('name' => 'drupal_migrate_ui', 'original_version' => ' (<=8.x-0.x-alpha1)', 'versions' => array(array('op' => '<=', 'version' => '0.x-alpha1')))),
-      array('drupal_migrate_ui(8.x-0.x-alpha1)', array('name' => 'drupal_migrate_ui', 'original_version' => ' (8.x-0.x-alpha1)', 'versions' => array(array('op' => '=', 'version' => '0.x-alpha1')))),
-      array('drupal_migrate_ui(>8.x-0.x)', array('name' => 'drupal_migrate_ui', 'original_version' => ' (>8.x-0.x)', 'versions' => array(array('op' => '>', 'version' => '1.x')))),
-      array('drupal_migrate_ui(<=8.x-0.x)', array('name' => 'drupal_migrate_ui', 'original_version' => ' (<=8.x-0.x)', 'versions' => array(array('op' => '<=', 'version' => '1.x')))),
-      array('drupal_migrate_ui(>8.x-0.x-unstable)', array('name' => 'drupal_migrate_ui', 'original_version' => ' (>8.x-0.x-unstable)', 'versions' => array(array('op' => '>', 'version' => '0.x-unstable')))),
+      array('drupal_migrate_ui(>8.x-0.0-alpha1)', array('name' => 'drupal_migrate_ui', 'original_version' => ' (>8.x-0.0-alpha1)', 'versions' => array(array('op' => '>', 'version' => '0.0-alpha1')))),
+      array('drupal_migrate_ui(<=8.x-0.0-alpha1)', array('name' => 'drupal_migrate_ui', 'original_version' => ' (<=8.x-0.0-alpha1)', 'versions' => array(array('op' => '<=', 'version' => '0.0-alpha1')))),
+      array('drupal_migrate_ui(8.x-0.0-alpha1)', array('name' => 'drupal_migrate_ui', 'original_version' => ' (8.x-0.0-alpha1)', 'versions' => array(array('op' => '=', 'version' => '0.0-alpha1')))),
+      array('drupal_migrate_ui(>8.x-0.0)', array('name' => 'drupal_migrate_ui', 'original_version' => ' (>8.x-0.0)', 'versions' => array(array('op' => '>', 'version' => '0.0')))),
+      array('drupal_migrate_ui(<=8.x-0.0)', array('name' => 'drupal_migrate_ui', 'original_version' => ' (<=8.x-0.0)', 'versions' => array(array('op' => '<=', 'version' => '0.0')))),
     );
   }