diff --git a/core/modules/comment/src/CommentTypeForm.php b/core/modules/comment/src/CommentTypeForm.php
index bb24b74..2e238ce 100644
--- a/core/modules/comment/src/CommentTypeForm.php
+++ b/core/modules/comment/src/CommentTypeForm.php
@@ -7,16 +7,16 @@
 
 namespace Drupal\comment;
 
-use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Logger\LoggerChannelInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Base form controller for category edit forms.
  */
-class CommentTypeForm extends EntityForm implements ContainerInjectionInterface {
+class CommentTypeForm extends EntityForm {
 
   /**
    * Entity manager service.
@@ -26,11 +26,19 @@ class CommentTypeForm extends EntityForm implements ContainerInjectionInterface
   protected $entityManager;
 
   /**
+   * Logger Channel service.
+   *
+   * @var \Drupal\Core\Logger\LoggerChannelInterface
+   */
+  protected $logger;
+
+  /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager')
+      $container->get('entity.manager'),
+      $container->get('logger.factory')->get('comment')
     );
   }
 
@@ -39,9 +47,12 @@ public static function create(ContainerInterface $container) {
    *
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager service.
+   * @param \Drupal\Core\Logger\LoggerChannelInterface
+   *   The logger channel
    */
-  function __construct(EntityManagerInterface $entity_manager) {
+  function __construct(EntityManagerInterface $entity_manager, LoggerChannelInterface $logger) {
     $this->entityManager = $entity_manager;
+    $this->logger = $logger;
   }
 
   /**
@@ -128,11 +139,11 @@ public function save(array $form, array &$form_state) {
     $edit_link = \Drupal::linkGenerator()->generateFromUrl($this->t('Edit'), $this->entity->urlInfo());
     if ($status == SAVED_UPDATED) {
       drupal_set_message(t('Comment type %label has been updated.', array('%label' => $comment_type->label())));
-      watchdog('comment', 'Comment type %label has been updated.', array('%label' => $comment_type->label()), WATCHDOG_NOTICE, $edit_link);
+      $this->logger->log(WATCHDOG_NOTICE, 'Comment type %label has been updated.', array('%label' => $comment_type->label(), 'link' => $edit_link));
     }
     else {
       drupal_set_message(t('Comment type %label has been added.', array('%label' => $comment_type->label())));
-      watchdog('comment', 'Comment type %label has been added.', array('%label' => $comment_type->label()), WATCHDOG_NOTICE, $edit_link);
+      $this->logger->log(WATCHDOG_NOTICE, 'Comment type %label has been added.', array('%label' => $comment_type->label(), 'link' =>  $edit_link));
     }
 
     $form_state['redirect_route']['route_name'] = 'comment.type_list';
diff --git a/core/modules/comment/src/Form/CommentTypeDeleteForm.php b/core/modules/comment/src/Form/CommentTypeDeleteForm.php
index c20577c..cb2b4d1 100644
--- a/core/modules/comment/src/Form/CommentTypeDeleteForm.php
+++ b/core/modules/comment/src/Form/CommentTypeDeleteForm.php
@@ -13,6 +13,7 @@
 use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Url;
 use Drupal\field\Entity\FieldConfig;
+use Drupal\Core\Logger\LoggerChannelInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -42,6 +43,13 @@ class CommentTypeDeleteForm extends EntityConfirmFormBase {
   protected $entityManager;
 
   /**
+   * The logger channel service.
+   *
+   * @var \Drupal\Core\Logger\LoggerChannelInterface
+   */
+  protected $logger;
+
+  /**
    * The entity being used by this form.
    *
    * @var \Drupal\comment\CommentTypeInterface
@@ -57,11 +65,14 @@ class CommentTypeDeleteForm extends EntityConfirmFormBase {
    *   The comment manager service.
    * @param \Drupal\Core\Entity\EntityManager $entity_manager
    *   The entity manager service.
+   * @param \Drupal\Core\Logger\LoggerChannelInterface
+   *   The logger channel
    */
-  public function __construct(QueryFactory $query_factory, CommentManagerInterface $comment_manager, EntityManager $entity_manager) {
+  public function __construct(QueryFactory $query_factory, CommentManagerInterface $comment_manager, EntityManager $entity_manager, LoggerChannelInterface $logger) {
     $this->queryFactory = $query_factory;
     $this->commentManager = $comment_manager;
     $this->entityManager = $entity_manager;
+    $this->logger = $logger;
   }
 
   /**
@@ -71,7 +82,8 @@ public static function create(ContainerInterface $container) {
     return new static(
       $container->get('entity.query'),
       $container->get('comment.manager'),
-      $container->get('entity.manager')
+      $container->get('entity.manager'),
+      $container->get('logger.factory')->get('comment')
     );
   }
 
@@ -132,7 +144,7 @@ public function submit(array $form, array &$form_state) {
     $this->entity->delete();
     $form_state['redirect_route']['route_name'] = 'comment.type_list';
     drupal_set_message(t('comment type %label has been deleted.', array('%label' => $this->entity->label())));
-    watchdog('comment', 'comment type %label has been deleted.', array('%label' => $this->entity->label()), WATCHDOG_NOTICE);
+    $this->logger->log(WATCHDOG_NOTICE, 'comment type %label has been deleted.', array('%label' => $this->entity->label()));
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php
index f167b5d..8d2d691 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php
@@ -13,7 +13,7 @@
 use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
 
 /**
- * Tests the Drupal 6 to Drupal 6 comment migration.
+ * Tests the Drupal 6 to Drupal 8 comment migration.
  */
 class MigrateCommentTest extends MigrateDrupalTestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTypeTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTypeTest.php
index 363cf42..0515888 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTypeTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTypeTest.php
@@ -13,7 +13,7 @@
 use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
 
 /**
- * Tests the Drupal 6 to Drupal 6 comment type migration.
+ * Tests the Drupal 6 to Drupal 8 comment type migration.
  */
 class MigrateCommentTypeTest extends MigrateDrupalTestBase {