diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php
index 2b04c7f..672a0d1 100644
--- a/core/lib/Drupal.php
+++ b/core/lib/Drupal.php
@@ -331,7 +331,7 @@ public static function flood() {
   /**
    * Returns the module handler.
    *
-   * @return \Drupal\Core\Extension\ModuleHandler
+   * @return \Drupal\Core\Extension\ModuleHandlerInterface
    */
   public static function moduleHandler() {
     return static::$container->get('module_handler');
@@ -364,7 +364,7 @@ public static function token() {
   /**
    * Returns the url generator service.
    *
-   * @return \Drupal\Core\Routing\UrlGenerator
+   * @return \Drupal\Core\Routing\PathBasedGeneratorInterface
    *   The url generator service.
    */
   public static function urlGenerator() {
diff --git a/core/lib/Drupal/Core/Controller/ControllerBase.php b/core/lib/Drupal/Core/Controller/ControllerBase.php
index 9920859..2bfc4f2 100644
--- a/core/lib/Drupal/Core/Controller/ControllerBase.php
+++ b/core/lib/Drupal/Core/Controller/ControllerBase.php
@@ -201,7 +201,7 @@ protected function flood() {
   /**
    * Returns the module handler.
    *
-   * @return \Drupal\Core\Extension\ModuleHandler
+   * @return \Drupal\Core\Extension\ModuleHandlerInterface
    */
   protected function moduleHandler() {
     return $this->container->get('module_handler');
@@ -234,7 +234,7 @@ protected function token() {
   /**
    * Returns the url generator service.
    *
-   * @return \Drupal\Core\Routing\UrlGenerator
+   * @return \Drupal\Core\Routing\PathBasedGeneratorInterface
    *   The url generator service.
    */
   protected function urlGenerator() {