diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php
index 97530d7..464eecd 100644
--- a/core/lib/Drupal/Core/Routing/UrlGenerator.php
+++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php
@@ -117,7 +117,7 @@ public function isStrictRequirements() {
   /**
    * {@inheritdoc}
    */
-  public function getPathFromRoute($name, $parameters = array()) {
+  public function generateInternalPathFromRoute($name, $parameters = array()) {
     $route = $this->getRoute($name);
     $name = $this->getRouteDebugMessage($name);
     $this->processRoute($name, $route, $parameters);
diff --git a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
index de28531..77149f3 100644
--- a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
+++ b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
@@ -89,7 +89,7 @@
   public function generateFromPath($path = NULL, $options = array());
 
   /**
-   * Gets the internal path (system path) of a route.
+   * Generate the internal path (system path) of a route.
    *
    * @param string|\Symfony\Component\Routing\Route $name
    *  The route name or a route object.
@@ -98,12 +98,13 @@ public function generateFromPath($path = NULL, $options = array());
    *  \Symfony\Component\Routing\Generator\UrlGeneratorInterface::generate().
    *
    * @return string
-   *  The internal Drupal path corresponding to the route.
+   *  The internal Drupal path corresponding to the route. This path will not
+   *  reflect path aliases.
    *
-   * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
-   *   System paths should not be used - use route names and parameters.
+   * @throws \Symfony\Component\Routing\Exception\RouteNotFoundException
+   *   Thrown if there is no route with that name in this repository.
    */
-  public function getPathFromRoute($name, $parameters = array());
+  public function generateInternalPathFromRoute($name, $parameters = array());
 
   /**
    * Generates a URL or path for a specific route based on the given parameters.
diff --git a/core/lib/Drupal/Core/Url.php b/core/lib/Drupal/Core/Url.php
index c6a5f05..8c6116f 100644
--- a/core/lib/Drupal/Core/Url.php
+++ b/core/lib/Drupal/Core/Url.php
@@ -776,7 +776,7 @@ public function getInternalPath() {
     }
 
     if (!isset($this->internalPath)) {
-      $this->internalPath = $this->urlGenerator()->getPathFromRoute($this->getRouteName(), $this->getRouteParameters());
+      $this->internalPath = $this->urlGenerator()->generateInternalPathFromRoute($this->getRouteName(), $this->getRouteParameters());
     }
     return $this->internalPath;
   }
diff --git a/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
index 796012f..af2948c 100644
--- a/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
+++ b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
@@ -172,7 +172,7 @@ public function testGetBaseRoute() {
    */
   public function testGetBasePath() {
     $this->urlGenerator->expects($this->once())
-      ->method('getPathFromRoute')
+      ->method('generateInternalPathFromRoute')
       ->with('system.site_information_settings', [])
       ->willReturn('/admin/config/system/site-information');
     $result = $this->configNamesMapper->getBasePath();
@@ -218,7 +218,7 @@ public function testGetOverviewRoute() {
    */
   public function testGetOverviewPath() {
     $this->urlGenerator->expects($this->once())
-      ->method('getPathFromRoute')
+      ->method('generateInternalPathFromRoute')
       ->with('config_translation.item.overview.system.site_information_settings', [])
       ->willReturn('/admin/config/system/site-information/translate');
 
diff --git a/core/modules/help/tests/modules/help_test/src/SuperNovaGenerator.php b/core/modules/help/tests/modules/help_test/src/SuperNovaGenerator.php
index 9b33f94..48247a4 100644
--- a/core/modules/help/tests/modules/help_test/src/SuperNovaGenerator.php
+++ b/core/modules/help/tests/modules/help_test/src/SuperNovaGenerator.php
@@ -46,7 +46,7 @@ public function generateFromPath($path = NULL, $options = array()) {
   /**
    * {@inheritdoc}
    */
-  public function getPathFromRoute($name, $parameters = array()) {
+  public function generateInternalPathFromRoute($name, $parameters = array()) {
     throw new \Exception();
   }
 
diff --git a/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php b/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php
index af29bce..31a138d 100644
--- a/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php
+++ b/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php
@@ -106,7 +106,7 @@ public function testConfigurationRename() {
       $names = $this->configImporter()->getStorageComparer()->extractRenameNames($rename);
       $this->assertText(SafeMarkup::format('!source_name to !target_name', array('!source_name' => $names['old_name'], '!target_name' => $names['new_name'])));
       // Test that the diff link is present for each renamed item.
-      $href = \Drupal::urlGenerator()->getPathFromRoute('config.diff', array('source_name' => $names['old_name'], 'target_name' => $names['new_name']));
+      $href = \Drupal::urlGenerator()->generateInternalPathFromRoute('config.diff', array('source_name' => $names['old_name'], 'target_name' => $names['new_name']));
       $this->assertLinkByHref($href);
       $hrefs[$rename] = $href;
     }
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
index 390eaf7..e945e48 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
@@ -221,7 +221,7 @@ public function testGetSystemPath() {
     $this->assertSame('', $no_link_entity->getSystemPath('banana'));
 
     $this->urlGenerator->expects($this->once())
-      ->method('getPathFromRoute')
+      ->method('generateInternalPathFromRoute')
       ->with('entity.test_entity_type.canonical', array('test_entity_type' => 'test_entity_id'))
       ->will($this->returnValue('entity/test_entity_type/test_entity_id'));
 
diff --git a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
index 52ab79f..bccfcad 100644
--- a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
@@ -21,6 +21,8 @@
  * Confirm that the UrlGenerator is functioning properly.
  *
  * @group Routing
+ *
+ * @coversDefaultClass \Drupal\Core\Routing\UrlGenerator
  */
 class UrlGeneratorTest extends UnitTestCase {
 
@@ -174,18 +176,20 @@ public function testAliasGeneration() {
     $url_from_route = $this->generator->generateFromRoute('test_1');
     $this->assertEquals($url_from_route, $url);
 
-    $path = $this->generator->getPathFromRoute('test_1');
+    $path = $this->generator->generateInternalPathFromRoute('test_1');
     $this->assertEquals('test/one', $path);
   }
 
   /**
    * Tests URL generation in a subdirectory.
+   *
+   * @covers ::generateInternalPathFromRoute
    */
-  public function testGetPathFromRouteWithSubdirectory() {
+  public function testGenerateInternalPathFromRouteWithSubdirectory() {
     $this->routeProcessorManager->expects($this->once())
       ->method('processOutbound');
 
-    $path = $this->generator->getPathFromRoute('test_1');
+    $path = $this->generator->generateInternalPathFromRoute('test_1');
     $this->assertEquals('test/one', $path);
   }
 
@@ -213,7 +217,7 @@ public function testAliasGenerationWithParameters() {
     $url = $this->generator->generateFromRoute('test_2', array('narf' => '7'), $options);
     $this->assertEquals('/test/two/7?page=1#bottom', $url);
 
-    $path = $this->generator->getPathFromRoute('test_2', array('narf' => '5'));
+    $path = $this->generator->generateInternalPathFromRoute('test_2', array('narf' => '5'));
     $this->assertEquals('test/two/5', $path);
   }
 
@@ -264,12 +268,14 @@ public function providerTestAliasGenerationWithOptions() {
 
   /**
    * Tests URL generation from route with trailing start and end slashes.
+   *
+   * @covers ::generateInternalPathFromRoute
    */
-  public function testGetPathFromRouteTrailing() {
+  public function testGenerateInternalPathFromRouteTrailing() {
     $this->routeProcessorManager->expects($this->once())
       ->method('processOutbound');
 
-    $path = $this->generator->getPathFromRoute('test_3');
+    $path = $this->generator->generateInternalPathFromRoute('test_3');
     $this->assertEquals($path, 'test/two');
   }
 
diff --git a/core/tests/Drupal/Tests/Core/UrlTest.php b/core/tests/Drupal/Tests/Core/UrlTest.php
index dcc2c66..421f2c93 100644
--- a/core/tests/Drupal/Tests/Core/UrlTest.php
+++ b/core/tests/Drupal/Tests/Core/UrlTest.php
@@ -349,7 +349,7 @@ public function testGetInternalPath($urls) {
       $url = clone $url;
       $url_generator = $this->getMock('Drupal\Core\Routing\UrlGeneratorInterface');
       $url_generator->expects($this->once())
-        ->method('getPathFromRoute')
+        ->method('generateInternalPathFromRoute')
         ->will($this->returnValueMap($map, $index));
       $url->setUrlGenerator($url_generator);
 
diff --git a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
index f73b493..61bf361 100644
--- a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
@@ -357,7 +357,7 @@ public function testGenerateActive() {
       )));
 
     $this->urlGenerator->expects($this->exactly(4))
-      ->method('getPathFromRoute')
+      ->method('generateInternalPathFromRoute')
       ->will($this->returnValueMap(array(
         array('test_route_1', array(), 'test-route-1'),
         array('test_route_3', array(), 'test-route-3'),