diff --git a/core/modules/comment/lib/Drupal/comment/Controller/AdminController.php b/core/modules/comment/lib/Drupal/comment/Controller/AdminController.php
index 4f49850..38260ec 100644
--- a/core/modules/comment/lib/Drupal/comment/Controller/AdminController.php
+++ b/core/modules/comment/lib/Drupal/comment/Controller/AdminController.php
@@ -10,7 +10,7 @@
 use Drupal\Component\Utility\String;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\comment\CommentManager;
+use Drupal\comment\CommentManagerInterface;
 use Drupal\field\FieldInfo;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -29,7 +29,7 @@ class AdminController extends ControllerBase implements ContainerInjectionInterf
   /**
    * The comment manager service.
    *
-   * @var \Drupal\comment\CommentManager
+   * @var \Drupal\comment\CommentManagerInterface
    */
   protected $commentManager;
 
@@ -48,10 +48,10 @@ public static function create(ContainerInterface $container) {
    *
    * @param \Drupal\field\FieldInfo $field_info
    *   The field info service.
-   * @param \Drupal\comment\CommentManager $comment_manager
+   * @param \Drupal\comment\CommentManagerInterface $comment_manager
    *   The comment manager service.
    */
-  public function __construct(FieldInfo $field_info, CommentManager $comment_manager) {
+  public function __construct(FieldInfo $field_info, CommentManagerInterface $comment_manager) {
     $this->fieldInfo = $field_info;
     $this->commentManager = $comment_manager;
   }
diff --git a/core/modules/comment/lib/Drupal/comment/Controller/CommentController.php b/core/modules/comment/lib/Drupal/comment/Controller/CommentController.php
index 7775219..1c2ffa9 100644
--- a/core/modules/comment/lib/Drupal/comment/Controller/CommentController.php
+++ b/core/modules/comment/lib/Drupal/comment/Controller/CommentController.php
@@ -8,7 +8,7 @@
 namespace Drupal\comment\Controller;
 
 use Drupal\comment\CommentInterface;
-use Drupal\comment\CommentManager;
+use Drupal\comment\CommentManagerInterface;
 use Drupal\field\FieldInfo;
 use Drupal\Core\Access\CsrfTokenGenerator;
 use Drupal\Core\Controller\ControllerBase;
@@ -61,7 +61,7 @@ class CommentController extends ControllerBase implements ContainerInjectionInte
   /**
    * The comment manager service.
    *
-   * @var \Drupal\comment\CommentManager
+   * @var \Drupal\comment\CommentManagerInterface
    */
   protected $commentManager;
 
@@ -76,10 +76,10 @@ class CommentController extends ControllerBase implements ContainerInjectionInte
    *   The current user service.
    * @param \Drupal\field\FieldInfo $field_info
    *   Field Info service.
-   * @param \Drupal\comment\CommentManager $comment_manager
+   * @param \Drupal\comment\CommentManagerInterface $comment_manager
    *   The comment manager service.
    */
-  public function __construct(HttpKernelInterface $httpKernel, CsrfTokenGenerator $csrf_token, AccountInterface $current_user, FieldInfo $field_info, CommentManager $comment_manager) {
+  public function __construct(HttpKernelInterface $httpKernel, CsrfTokenGenerator $csrf_token, AccountInterface $current_user, FieldInfo $field_info, CommentManagerInterface $comment_manager) {
     $this->httpKernel = $httpKernel;
     $this->csrfToken = $csrf_token;
     $this->currentUser = $current_user;
diff --git a/core/modules/comment/lib/Drupal/comment/Form/DeleteForm.php b/core/modules/comment/lib/Drupal/comment/Form/DeleteForm.php
index 2c13db5..07f3146 100644
--- a/core/modules/comment/lib/Drupal/comment/Form/DeleteForm.php
+++ b/core/modules/comment/lib/Drupal/comment/Form/DeleteForm.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\comment\Form;
 
-use Drupal\comment\CommentManager;
+use Drupal\comment\CommentManagerInterface;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Entity\ContentEntityConfirmFormBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -20,17 +20,17 @@ class DeleteForm extends ContentEntityConfirmFormBase {
   /**
    * The comment manager.
    *
-   * @var \Drupal\comment\CommentManager
+   * @var \Drupal\comment\CommentManagerInterface
    */
   protected $commentManager;
 
   /**
    * Constructs a DeleteForm object.
    *
-   * @param \Drupal\comment\CommentManager $comment_manager
+   * @param \Drupal\comment\CommentManagerInterface $comment_manager
    *   The comment manager service.
    */
-  public function __construct(CommentManager $comment_manager) {
+  public function __construct(CommentManagerInterface $comment_manager) {
     $this->commentManager = $comment_manager;
   }