diff --git a/core/lib/Drupal/Core/Url.php b/core/lib/Drupal/Core/Url.php
index 1067776..9aed35c 100644
--- a/core/lib/Drupal/Core/Url.php
+++ b/core/lib/Drupal/Core/Url.php
@@ -407,7 +407,7 @@ protected static function fromInternalUri(array $uri_parts, array $options) {
     }
     else {
       if ($uri_parts['path'][0] !== '/') {
-        throw new \InvalidArgumentException(String::format('The user-path path component "@path" is invalid. Its path component must have a leading slash, e.g. user-path:/foo.', ['@path' => $uri_parts['path']]));
+        throw new \InvalidArgumentException(String::format('The internal path component "@path" is invalid. Its path component must have a leading slash, e.g. internal:/foo.', ['@path' => $uri_parts['path']]));
       }
       // Remove the leading slash.
       $uri_parts['path'] = substr($uri_parts['path'], 1);
diff --git a/core/tests/Drupal/Tests/Core/UrlTest.php b/core/tests/Drupal/Tests/Core/UrlTest.php
index f85ceed..8b0ecf3 100644
--- a/core/tests/Drupal/Tests/Core/UrlTest.php
+++ b/core/tests/Drupal/Tests/Core/UrlTest.php
@@ -710,13 +710,13 @@ public function providerTestToUriStringForInternalScheme() {
   }
 
   /**
-   * Tests the fromUri() method with a valid user-path: URI.
+   * Tests the fromUri() method with a valid internal: URI.
    *
    * @covers ::fromUri
    * @dataProvider providerFromValidUserPathUri
    */
   public function testFromValidUserPathUri($path) {
-    $url = Url::fromUri('user-path:' . $path);
+    $url = Url::fromUri('internal:' . $path);
     $this->assertInstanceOf('Drupal\Core\Url', $url);
   }
 
@@ -748,7 +748,7 @@ public function providerFromValidUserPathUri() {
   }
 
   /**
-   * Tests the fromUri() method with an invalid user-path: URI.
+   * Tests the fromUri() method with an invalid internal: URI.
    *
    * @covers ::fromUri
    * @expectedException \InvalidArgumentException