diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 319067d..d641e05 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -257,6 +257,8 @@ function comment_node_view_alter(array &$build, EntityInterface $node, EntityVie
  *
  * @return array
  *   An array as expected by drupal_render().
+ * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+ *   Use entity_view() instead.
  */
 function comment_view(CommentInterface $comment, $view_mode = 'full', $langcode = NULL) {
   return entity_view($comment, $view_mode, $langcode);
@@ -278,6 +280,8 @@ function comment_view(CommentInterface $comment, $view_mode = 'full', $langcode
  *   An array in the format expected by drupal_render().
  *
  * @see drupal_render()
+ * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+ *   Use entity_view() instead.
  */
 function comment_view_multiple($comments, $view_mode = 'full', $langcode = NULL) {
   return entity_view_multiple($comments, $view_mode, $langcode);
@@ -578,7 +582,7 @@ function comment_preview(CommentInterface $comment, FormStateInterface $form_sta
     $comment->setCreatedTime($created_time);
     $comment->changed->value = REQUEST_TIME;
     $comment->in_preview = TRUE;
-    $comment_build = comment_view($comment);
+    $comment_build = entity_view($comment, 'full');
     $comment_build['#weight'] = -100;
 
     $preview_build['comment_preview'] = $comment_build;
@@ -588,7 +592,7 @@ function comment_preview(CommentInterface $comment, FormStateInterface $form_sta
     $build = array();
     $parent = $comment->getParentComment();
     if ($parent && $parent->isPublished()) {
-      $build = comment_view($parent);
+      $build = entity_view($parent, 'full');
     }
   }
   else {
diff --git a/core/modules/comment/src/Entity/Comment.php b/core/modules/comment/src/Entity/Comment.php
index bd3fbfc..6bdf80b 100644
--- a/core/modules/comment/src/Entity/Comment.php
+++ b/core/modules/comment/src/Entity/Comment.php
@@ -81,7 +81,6 @@ public function preSave(EntityStorageInterface $storage) {
     }
     if ($this->isNew()) {
       // Add the comment to database. This next section builds the thread field.
-      // Also see the documentation for comment_view().
       $thread = $this->getThread();
       if (empty($thread)) {
         if ($this->threadLock) {
diff --git a/core/modules/comment/src/Plugin/Action/UnpublishByKeywordComment.php b/core/modules/comment/src/Plugin/Action/UnpublishByKeywordComment.php
index 56706ad..b00f408 100644
--- a/core/modules/comment/src/Plugin/Action/UnpublishByKeywordComment.php
+++ b/core/modules/comment/src/Plugin/Action/UnpublishByKeywordComment.php
@@ -27,7 +27,7 @@ class UnpublishByKeywordComment extends ConfigurableActionBase {
    * {@inheritdoc}
    */
   public function execute($comment = NULL) {
-    $build = comment_view($comment);
+    $build = entity_view($comment, 'full');
     $text = drupal_render($build);
     foreach ($this->configuration['keywords'] as $keyword) {
       if (strpos($text, $keyword) !== FALSE) {
diff --git a/core/modules/comment/src/Plugin/views/row/Rss.php b/core/modules/comment/src/Plugin/views/row/Rss.php
index 3002765..554aa7e 100644
--- a/core/modules/comment/src/Plugin/views/row/Rss.php
+++ b/core/modules/comment/src/Plugin/views/row/Rss.php
@@ -106,7 +106,7 @@ public function render($row) {
 
     // The comment gets built and modules add to or modify
     // $comment->rss_elements and $comment->rss_namespaces.
-    $build = comment_view($comment, 'rss');
+    $build = entity_view($comment, 'rss');
     unset($build['#theme']);
 
     if (!empty($comment->rss_namespaces)) {