diff --git a/core/lib/Drupal/Core/Controller/ControllerBase.php b/core/lib/Drupal/Core/Controller/ControllerBase.php
index 49d2062..6ab8937 100644
--- a/core/lib/Drupal/Core/Controller/ControllerBase.php
+++ b/core/lib/Drupal/Core/Controller/ControllerBase.php
@@ -27,7 +27,7 @@
  * need to be refactored into a thin controller and a dependent unit-testable
  * service.
  *
- * @see \Drupal\Core\Controller\ContainerControllerInterface
+ * @see \Drupal\Core\Controller\ContainerFactoryControllerInterface
  */
 abstract class ControllerBase extends ContainerAware {
 
diff --git a/core/lib/Drupal/Core/Controller/HtmlFormController.php b/core/lib/Drupal/Core/Controller/HtmlFormController.php
index 52ad53b..b4b5b4f 100644
--- a/core/lib/Drupal/Core/Controller/HtmlFormController.php
+++ b/core/lib/Drupal/Core/Controller/HtmlFormController.php
@@ -82,7 +82,7 @@ public function content(Request $request, $_form) {
   protected function getFormObject(Request $request, $form_arg) {
     // If this is a class, instantiate it.
     if (class_exists($form_arg)) {
-      if (in_array('Drupal\Core\Controller\ContainerControllerInterface', class_implements($form_arg))) {
+      if (in_array('Drupal\Core\Controller\ContainerFactoryControllerInterface', class_implements($form_arg))) {
         return $form_arg::create($this->container);
       }