diff --git a/core/modules/comment/src/CommentManager.php b/core/modules/comment/src/CommentManager.php
index ef884e1..51e73b4 100644
--- a/core/modules/comment/src/CommentManager.php
+++ b/core/modules/comment/src/CommentManager.php
@@ -121,7 +121,7 @@ public function getFields($entity_type_id) {
   /**
    * {@inheritdoc}
    */
-  public function addDefaultField($entity_type, $bundle, $field_name = 'comment', $default_value = CommentItemInterface::OPEN, $comment_type_id = 'comment') {
+  public function commentDefaultFieldTrait($entity_type, $bundle, $field_name = 'comment', $default_value = CommentItemInterface::OPEN, $comment_type_id = 'comment') {
     // Create the comment type if needed.
     $comment_type_storage = $this->entityManager->getStorage('comment_type');
     if ($comment_type = $comment_type_storage->load($comment_type_id)) {
diff --git a/core/modules/comment/src/CommentManagerInterface.php b/core/modules/comment/src/CommentManagerInterface.php
index 0f00351..7ed3f8b 100644
--- a/core/modules/comment/src/CommentManagerInterface.php
+++ b/core/modules/comment/src/CommentManagerInterface.php
@@ -63,7 +63,7 @@ public function getFields($entity_type_id);
    * @param string $comment_type_id
    *   (optional) ID of comment type to use. Defaults to 'comment'.
    */
-  public function addDefaultField($entity_type, $bundle, $field_name = 'comment', $default_value = CommentItemInterface::OPEN, $comment_type_id = 'comment');
+  public function commentDefaultFieldTrait($entity_type, $bundle, $field_name = 'comment', $default_value = CommentItemInterface::OPEN, $comment_type_id = 'comment');
 
   /**
    * Creates a comment_body field.
diff --git a/core/modules/comment/src/Tests/CommentBookTest.php b/core/modules/comment/src/Tests/CommentBookTest.php
index eb20e68..5411ff5 100644
--- a/core/modules/comment/src/Tests/CommentBookTest.php
+++ b/core/modules/comment/src/Tests/CommentBookTest.php
@@ -28,7 +28,7 @@ protected function setUp() {
     parent::setUp();
 
     // Create comment field on book.
-    \Drupal::service('comment.manager')->addDefaultField('node', 'book');
+    \Drupal::service('comment.manager')->commentDefaultFieldTrait('node', 'book');
   }
 
   /**
diff --git a/core/modules/comment/src/Tests/CommentCacheTagsTest.php b/core/modules/comment/src/Tests/CommentCacheTagsTest.php
index 6f83dbf..d45b9f6 100644
--- a/core/modules/comment/src/Tests/CommentCacheTagsTest.php
+++ b/core/modules/comment/src/Tests/CommentCacheTagsTest.php
@@ -47,7 +47,7 @@ protected function createEntity() {
     entity_test_create_bundle($bundle, NULL, 'entity_test');
 
     // Create a comment field on this bundle.
-    \Drupal::service('comment.manager')->addDefaultField('entity_test', 'bar', 'comment');
+    \Drupal::service('comment.manager')->commentDefaultFieldTrait('entity_test', 'bar', 'comment');
 
     // Display comments in a flat list; threaded comments are not render cached.
     $field = FieldConfig::loadByName('entity_test', 'bar', 'comment');
diff --git a/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php b/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php
index 1a97e1b..3c1508b 100644
--- a/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php
+++ b/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php
@@ -48,7 +48,7 @@ protected function setUp() {
 
     // Set up a field, so that the entity that'll be referenced bubbles up a
     // cache tag when rendering it entirely.
-    \Drupal::service('comment.manager')->addDefaultField('entity_test', 'entity_test');
+    \Drupal::service('comment.manager')->commentDefaultFieldTrait('entity_test', 'entity_test');
   }
 
   /**
diff --git a/core/modules/comment/src/Tests/CommentFieldAccessTest.php b/core/modules/comment/src/Tests/CommentFieldAccessTest.php
index c6cd2d2..6888aaa 100644
--- a/core/modules/comment/src/Tests/CommentFieldAccessTest.php
+++ b/core/modules/comment/src/Tests/CommentFieldAccessTest.php
@@ -129,8 +129,8 @@ public function testAccessToAdministrativeFields() {
     /** @var \Drupal\comment\CommentManagerInterface $manager */
     $manager = \Drupal::service('comment.manager');
     // Add two fields.
-    $manager->addDefaultField('entity_test', 'entity_test', 'comment');
-    $manager->addDefaultField('entity_test', 'entity_test', 'comment_other');
+    $manager->commentDefaultFieldTrait('entity_test', 'entity_test', 'comment');
+    $manager->commentDefaultFieldTrait('entity_test', 'entity_test', 'comment_other');
 
     // Change the second field's anonymous contact setting.
     $instance = FieldConfig::loadByName('entity_test', 'entity_test', 'comment_other');
diff --git a/core/modules/comment/src/Tests/CommentFieldsTest.php b/core/modules/comment/src/Tests/CommentFieldsTest.php
index 1ded5d1..15bbe85 100644
--- a/core/modules/comment/src/Tests/CommentFieldsTest.php
+++ b/core/modules/comment/src/Tests/CommentFieldsTest.php
@@ -32,7 +32,7 @@ function testCommentDefaultFields() {
     // Do not make assumptions on default node types created by the test
     // installation profile, and create our own.
     $this->drupalCreateContentType(array('type' => 'test_node_type'));
-    $this->container->get('comment.manager')->addDefaultField('node', 'test_node_type');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'test_node_type');
 
     // Check that the 'comment_body' field is present on the comment bundle.
     $field = FieldConfig::loadByName('comment', 'comment', 'comment_body');
@@ -48,7 +48,7 @@ function testCommentDefaultFields() {
     // Create a new content type.
     $type_name = 'test_node_type_2';
     $this->drupalCreateContentType(array('type' => $type_name));
-    $this->container->get('comment.manager')->addDefaultField('node', $type_name);
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', $type_name);
 
     // Check that the 'comment_body' field exists and has an instance on the
     // new comment bundle.
@@ -58,7 +58,7 @@ function testCommentDefaultFields() {
     $this->assertTrue(isset($field), format_string('The comment_body field is present for comments on type @type', array('@type' => $type_name)));
 
     // Test adding a field that defaults to CommentItemInterface::CLOSED.
-    $this->container->get('comment.manager')->addDefaultField('node', 'test_node_type', 'who_likes_ponies', CommentItemInterface::CLOSED, 'who_likes_ponies');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'test_node_type', 'who_likes_ponies', CommentItemInterface::CLOSED, 'who_likes_ponies');
     $field = FieldConfig::load('node.test_node_type.who_likes_ponies');
     $this->assertEqual($field->default_value[0]['status'], CommentItemInterface::CLOSED);
   }
@@ -68,11 +68,11 @@ function testCommentDefaultFields() {
    */
   public function testCommentFieldDelete() {
     $this->drupalCreateContentType(array('type' => 'test_node_type'));
-    $this->container->get('comment.manager')->addDefaultField('node', 'test_node_type');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'test_node_type');
     // We want to test the handling of removing the primary comment field, so we
     // ensure there is at least one other comment field attached to a node type
     // so that comment_entity_load() runs for nodes.
-    $this->container->get('comment.manager')->addDefaultField('node', 'test_node_type', 'comment2');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'test_node_type', 'comment2');
 
     // Create a sample node.
     $node = $this->drupalCreateNode(array(
@@ -132,7 +132,7 @@ function testCommentInstallAfterContentModule() {
     $this->assertTrue($this->container->get('module_handler')->moduleExists('comment'), 'Comment module enabled.');
 
     // Create nodes of each type.
-    $this->container->get('comment.manager')->addDefaultField('node', 'book');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'book');
     $book_node = $this->drupalCreateNode(array('type' => 'book'));
 
     $this->drupalLogout();
diff --git a/core/modules/comment/src/Tests/CommentLanguageTest.php b/core/modules/comment/src/Tests/CommentLanguageTest.php
index ab70e7d..d492b01 100644
--- a/core/modules/comment/src/Tests/CommentLanguageTest.php
+++ b/core/modules/comment/src/Tests/CommentLanguageTest.php
@@ -67,7 +67,7 @@ protected function setUp() {
     $this->drupalPostForm("user/" . $admin_user->id() . "/edit", $edit, t('Save'));
 
     // Create comment field on article.
-    $this->container->get('comment.manager')->addDefaultField('node', 'article');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'article');
 
     // Make comment body translatable.
     $field_storage = FieldStorageConfig::loadByName('comment', 'comment_body');
diff --git a/core/modules/comment/src/Tests/CommentNonNodeTest.php b/core/modules/comment/src/Tests/CommentNonNodeTest.php
index 65271a1..1d6ba40 100644
--- a/core/modules/comment/src/Tests/CommentNonNodeTest.php
+++ b/core/modules/comment/src/Tests/CommentNonNodeTest.php
@@ -46,7 +46,7 @@ protected function setUp() {
       'target_entity_type_id' => 'entity_test',
     ))->save();
     // Create comment field on entity_test bundle.
-    $this->container->get('comment.manager')->addDefaultField('entity_test', 'entity_test');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('entity_test', 'entity_test');
 
     // Verify that bundles are defined correctly.
     $bundles = \Drupal::entityManager()->getBundleInfo('comment');
diff --git a/core/modules/comment/src/Tests/CommentPagerTest.php b/core/modules/comment/src/Tests/CommentPagerTest.php
index 18bb32d..5897bea 100644
--- a/core/modules/comment/src/Tests/CommentPagerTest.php
+++ b/core/modules/comment/src/Tests/CommentPagerTest.php
@@ -273,7 +273,7 @@ function testCommentNewPageIndicator() {
    */
   function testTwoPagers() {
     // Add another field to article content-type.
-    $this->container->get('comment.manager')->addDefaultField('node', 'article', 'comment_2');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'article', 'comment_2');
     // Set default to display comment list with unique pager id.
     entity_get_display('node', 'article', 'default')
       ->setComponent('comment_2', array(
diff --git a/core/modules/comment/src/Tests/CommentTestBase.php b/core/modules/comment/src/Tests/CommentTestBase.php
index 5acb24a..20608db 100644
--- a/core/modules/comment/src/Tests/CommentTestBase.php
+++ b/core/modules/comment/src/Tests/CommentTestBase.php
@@ -79,7 +79,7 @@ protected function setUp() {
     ));
 
     // Create comment field on article.
-    $this->container->get('comment.manager')->addDefaultField('node', 'article');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'article');
 
     // Create a test node authored by the web user.
     $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'uid' => $this->webUser->id()));
diff --git a/core/modules/comment/src/Tests/CommentTranslationUITest.php b/core/modules/comment/src/Tests/CommentTranslationUITest.php
index a0d13a9..ebb5c1e 100644
--- a/core/modules/comment/src/Tests/CommentTranslationUITest.php
+++ b/core/modules/comment/src/Tests/CommentTranslationUITest.php
@@ -52,12 +52,12 @@ function setupBundle() {
     parent::setupBundle();
     $this->drupalCreateContentType(array('type' => $this->nodeBundle, 'name' => $this->nodeBundle));
     // Add a comment field to the article content type.
-    $this->container->get('comment.manager')->addDefaultField('node', 'article', 'comment_article', CommentItemInterface::OPEN, 'comment_article');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'article', 'comment_article', CommentItemInterface::OPEN, 'comment_article');
     // Create a page content type.
     $this->drupalCreateContentType(array('type' => 'page', 'name' => 'page'));
     // Add a comment field to the page content type - this one won't be
     // translatable.
-    $this->container->get('comment.manager')->addDefaultField('node', 'page', 'comment');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'page', 'comment');
     // Mark this bundle as translatable.
     $this->container->get('content_translation.manager')->setEnabled('comment', 'comment_article', TRUE);
   }
diff --git a/core/modules/comment/src/Tests/CommentTypeTest.php b/core/modules/comment/src/Tests/CommentTypeTest.php
index 060d69d..d162753 100644
--- a/core/modules/comment/src/Tests/CommentTypeTest.php
+++ b/core/modules/comment/src/Tests/CommentTypeTest.php
@@ -127,7 +127,7 @@ public function testCommentTypeDeletion() {
     // Create a comment type programmatically.
     $type = $this->createCommentType('foo');
     $this->drupalCreateContentType(array('type' => 'page'));
-    \Drupal::service('comment.manager')->addDefaultField('node', 'page', 'foo', CommentItemInterface::OPEN, 'foo');
+    \Drupal::service('comment.manager')->commentDefaultFieldTrait('node', 'page', 'foo', CommentItemInterface::OPEN, 'foo');
     $field_storage = FieldStorageConfig::loadByName('node', 'foo');
 
     $this->drupalLogin($this->adminUser);
@@ -176,7 +176,7 @@ public function testCommentTypeDeletion() {
 
     // Test exception thrown when re-using an existing comment type.
     try {
-      \Drupal::service('comment.manager')->addDefaultField('comment', 'comment', 'bar');
+      \Drupal::service('comment.manager')->commentDefaultFieldTrait('comment', 'comment', 'bar');
       $this->fail('Exception not thrown.');
     }
     catch (\InvalidArgumentException $e) {
diff --git a/core/modules/comment/src/Tests/CommentUninstallTest.php b/core/modules/comment/src/Tests/CommentUninstallTest.php
index 419932d..23c4971 100644
--- a/core/modules/comment/src/Tests/CommentUninstallTest.php
+++ b/core/modules/comment/src/Tests/CommentUninstallTest.php
@@ -30,7 +30,7 @@ protected function setUp() {
     // Create an article content type.
     $this->drupalCreateContentType(array('type' => 'article', 'name' => t('Article')));
     // Create comment field on article so that adds 'comment_body' field.
-    $this->container->get('comment.manager')->addDefaultField('node', 'article');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'article');
   }
 
   /**
diff --git a/core/modules/comment/src/Tests/Views/CommentTestBase.php b/core/modules/comment/src/Tests/Views/CommentTestBase.php
index 7d4705f..2191321 100644
--- a/core/modules/comment/src/Tests/Views/CommentTestBase.php
+++ b/core/modules/comment/src/Tests/Views/CommentTestBase.php
@@ -69,7 +69,7 @@ protected function setUp() {
     $this->drupalLogin($this->account);
 
     $this->drupalCreateContentType(array('type' => 'page', 'name' => t('Basic page')));
-    $this->container->get('comment.manager')->addDefaultField('node', 'page');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'page');
 
     $this->nodeUserPosted = $this->drupalCreateNode();
     $this->nodeUserCommented = $this->drupalCreateNode(array('uid' => $this->account2->id()));
diff --git a/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php b/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php
index acd1398..41afddb 100644
--- a/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php
+++ b/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php
@@ -71,7 +71,7 @@ protected function setUp() {
       'type' => $content_type->id(),
     );
 
-    $this->container->get('comment.manager')->addDefaultField('node', $content_type->id());
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', $content_type->id());
     $this->node = $this->drupalCreateNode($node_data);
 
     // Force a flush of the in-memory storage.
diff --git a/core/modules/comment/src/Tests/Views/WizardTest.php b/core/modules/comment/src/Tests/Views/WizardTest.php
index 6747acc..6418698 100644
--- a/core/modules/comment/src/Tests/Views/WizardTest.php
+++ b/core/modules/comment/src/Tests/Views/WizardTest.php
@@ -33,7 +33,7 @@ protected function setUp() {
     parent::setUp();
     $this->drupalCreateContentType(array('type' => 'page', 'name' => t('Basic page')));
     // Add comment field to page node type.
-    $this->container->get('comment.manager')->addDefaultField('node', 'page');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'page');
   }
 
   /**
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php b/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
index f5f3c89..abd224c 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
@@ -35,8 +35,8 @@ protected function setUp() {
     // bundles.
     $this->drupalCreateContentType(array('type' => 'article'));
     $this->drupalCreateContentType(array('type' => 'page'));
-    $this->container->get('comment.manager')->addDefaultField('node', 'article', 'comment_article', CommentItemInterface::OPEN, 'comment_article');
-    $this->container->get('comment.manager')->addDefaultField('node', 'page', 'comment_page');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'article', 'comment_article', CommentItemInterface::OPEN, 'comment_article');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'page', 'comment_page');
 
     $admin_user = $this->drupalCreateUser(array('access administration pages', 'administer languages', 'administer content translation', 'administer content types', 'administer node fields', 'administer comment fields', 'administer comments', 'administer comment types', 'administer account settings'));
     $this->drupalLogin($admin_user);
diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceSelectionAccessTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceSelectionAccessTest.php
index 591e619..cb196aa 100644
--- a/core/modules/entity_reference/src/Tests/EntityReferenceSelectionAccessTest.php
+++ b/core/modules/entity_reference/src/Tests/EntityReferenceSelectionAccessTest.php
@@ -390,7 +390,7 @@ public function testCommentHandler() {
     }
 
     // Create comment field on article.
-    $this->container->get('comment.manager')->addDefaultField('node', 'article');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'article');
 
     $comment_values = array(
       'published_published' => array(
diff --git a/core/modules/file/src/Tests/FileFieldWidgetTest.php b/core/modules/file/src/Tests/FileFieldWidgetTest.php
index c3ce5f0..8c3bb7a 100644
--- a/core/modules/file/src/Tests/FileFieldWidgetTest.php
+++ b/core/modules/file/src/Tests/FileFieldWidgetTest.php
@@ -260,7 +260,7 @@ function testPrivateFileComment() {
     user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, array('post comments', 'skip comment approval'));
 
     // Create a new field.
-    $this->container->get('comment.manager')->addDefaultField('node', 'article');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'article');
 
     $name = strtolower($this->randomMachineName());
     $label = $this->randomMachineName();
diff --git a/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php b/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php
index 6febe30..ce7de3e 100644
--- a/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php
+++ b/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php
@@ -68,7 +68,7 @@ protected function setUp() {
     // Setup a node to comment and test on.
     $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
     // Add a comment field.
-    $this->container->get('comment.manager')->addDefaultField('node', 'page');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'page');
     $this->node = $this->drupalCreateNode();
   }
 
diff --git a/core/modules/hal/src/Tests/EntityTest.php b/core/modules/hal/src/Tests/EntityTest.php
index ef20228..f595beb 100644
--- a/core/modules/hal/src/Tests/EntityTest.php
+++ b/core/modules/hal/src/Tests/EntityTest.php
@@ -50,7 +50,7 @@ public function testNode() {
       'target_entity_type_id' => 'node',
     ))->save();
 
-    $this->container->get('comment.manager')->addDefaultField('node', 'example_type');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'example_type');
 
     $node = entity_create('node', array(
       'title' => $this->randomMachineName(),
@@ -146,7 +146,7 @@ public function testComment() {
       'target_entity_type_id' => 'node',
     ))->save();
 
-    $this->container->get('comment.manager')->addDefaultField('node', 'example_type');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'example_type');
 
     $node = entity_create('node', array(
       'title' => $this->randomMachineName(),
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php
index c1e9273..dda8246 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php
@@ -28,7 +28,7 @@ protected function setUp() {
     parent::setUp();
     entity_create('node_type', array('type' => 'page'))->save();
     entity_create('node_type', array('type' => 'story'))->save();
-    \Drupal::service('comment.manager')->addDefaultField('node', 'story');
+    \Drupal::service('comment.manager')->commentDefaultFieldTrait('node', 'story');
     $this->container->get('entity.manager')->getStorage('comment_type')->create(array(
       'id' => 'comment_no_subject',
       'label' => 'comment_no_subject',
diff --git a/core/modules/node/src/Tests/NodeAccessPagerTest.php b/core/modules/node/src/Tests/NodeAccessPagerTest.php
index f9deff8..7d24f7c 100644
--- a/core/modules/node/src/Tests/NodeAccessPagerTest.php
+++ b/core/modules/node/src/Tests/NodeAccessPagerTest.php
@@ -29,7 +29,7 @@ protected function setUp() {
 
     node_access_rebuild();
     $this->drupalCreateContentType(array('type' => 'page', 'name' => t('Basic page')));
-    $this->container->get('comment.manager')->addDefaultField('node', 'page');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'page');
     $this->webUser = $this->drupalCreateUser(array('access content', 'access comments', 'node test view'));
   }
 
diff --git a/core/modules/node/src/Tests/NodeTitleTest.php b/core/modules/node/src/Tests/NodeTitleTest.php
index 25e2576..21dca37 100644
--- a/core/modules/node/src/Tests/NodeTitleTest.php
+++ b/core/modules/node/src/Tests/NodeTitleTest.php
@@ -33,7 +33,7 @@ protected function setUp() {
 
     $this->adminUser = $this->drupalCreateUser(array('administer nodes', 'create article content', 'create page content', 'post comments'));
     $this->drupalLogin($this->adminUser);
-    $this->container->get('comment.manager')->addDefaultField('node', 'page');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'page');
   }
 
   /**
diff --git a/core/modules/search/src/Tests/SearchCommentCountToggleTest.php b/core/modules/search/src/Tests/SearchCommentCountToggleTest.php
index 5f2fd43..10159fb 100644
--- a/core/modules/search/src/Tests/SearchCommentCountToggleTest.php
+++ b/core/modules/search/src/Tests/SearchCommentCountToggleTest.php
@@ -54,7 +54,7 @@ protected function setUp() {
     $this->drupalLogin($this->searchingUser);
 
     // Add a comment field.
-    $this->container->get('comment.manager')->addDefaultField('node', 'article');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'article');
     // Create initial nodes.
     $node_params = array('type' => 'article', 'body' => array(array('value' => 'SearchCommentToggleTestCase')));
 
diff --git a/core/modules/search/src/Tests/SearchCommentTest.php b/core/modules/search/src/Tests/SearchCommentTest.php
index 1818350..43f159b 100644
--- a/core/modules/search/src/Tests/SearchCommentTest.php
+++ b/core/modules/search/src/Tests/SearchCommentTest.php
@@ -78,7 +78,7 @@ protected function setUp() {
     $this->adminUser = $this->drupalCreateUser($permissions);
     $this->drupalLogin($this->adminUser);
     // Add a comment field.
-    $this->container->get('comment.manager')->addDefaultField('node', 'article');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'article');
   }
 
   /**
diff --git a/core/modules/search/src/Tests/SearchRankingTest.php b/core/modules/search/src/Tests/SearchRankingTest.php
index f2fb125..3311b86 100644
--- a/core/modules/search/src/Tests/SearchRankingTest.php
+++ b/core/modules/search/src/Tests/SearchRankingTest.php
@@ -43,7 +43,7 @@ protected function setUp() {
 
   public function testRankings() {
     // Add a comment field.
-    $this->container->get('comment.manager')->addDefaultField('node', 'page');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'page');
 
     // Build a list of the rankings to test.
     $node_ranks = array('sticky', 'promote', 'relevance', 'recent', 'comments', 'views');
diff --git a/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php b/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php
index 35ea408..cf8c888 100644
--- a/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php
@@ -140,7 +140,7 @@ public function testCommentHooks() {
       'type' => 'article',
       'name' => 'Article',
     ))->save();
-    $this->container->get('comment.manager')->addDefaultField('node', 'article', 'comment', CommentItemInterface::OPEN);
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'article', 'comment', CommentItemInterface::OPEN);
 
     $node = entity_create('node', array(
       'uid' => $account->id(),
diff --git a/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php b/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php
index 8360cd4..a961ac9 100644
--- a/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php
+++ b/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php
@@ -97,7 +97,7 @@ protected function setUp() {
     $this->term->save();
 
     // Add a comment field.
-    $this->container->get('comment.manager')->addDefaultField('node', 'article', 'comment', CommentItemInterface::OPEN);
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'article', 'comment', CommentItemInterface::OPEN);
     // Create a test node tagged with the test term.
     $this->node = $this->drupalCreateNode(array(
       'title' => $this->xss_label,
diff --git a/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php b/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php
index 62129d8..e56b718 100644
--- a/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php
+++ b/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php
@@ -29,7 +29,7 @@ protected function setUp() {
     node_access_rebuild();
     $this->drupalCreateContentType(array('type' => 'page'));
     node_access_test_add_field(entity_load('node_type', 'page'));
-    $this->container->get('comment.manager')->addDefaultField('node', 'page', 'comment', CommentItemInterface::OPEN);
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'page', 'comment', CommentItemInterface::OPEN);
     \Drupal::state()->set('node_access_test.private', TRUE);
   }
 
diff --git a/core/modules/tracker/src/Tests/TrackerTest.php b/core/modules/tracker/src/Tests/TrackerTest.php
index 80f6fa5..899c988 100644
--- a/core/modules/tracker/src/Tests/TrackerTest.php
+++ b/core/modules/tracker/src/Tests/TrackerTest.php
@@ -46,7 +46,7 @@ protected function setUp() {
     $permissions = array('access comments', 'create page content', 'post comments', 'skip comment approval');
     $this->user = $this->drupalCreateUser($permissions);
     $this->otherUser = $this->drupalCreateUser($permissions);
-    $this->container->get('comment.manager')->addDefaultField('node', 'page');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'page');
   }
 
   /**
diff --git a/core/modules/tracker/src/Tests/Views/TrackerTestBase.php b/core/modules/tracker/src/Tests/Views/TrackerTestBase.php
index 5ec6597..f336e45 100644
--- a/core/modules/tracker/src/Tests/Views/TrackerTestBase.php
+++ b/core/modules/tracker/src/Tests/Views/TrackerTestBase.php
@@ -44,7 +44,7 @@ protected function setUp() {
 
     $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
     // Add a comment field.
-    $this->container->get('comment.manager')->addDefaultField('node', 'page');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'page');
 
     $permissions = array('access comments', 'create page content', 'post comments', 'skip comment approval');
     $account = $this->drupalCreateUser($permissions);
diff --git a/core/modules/user/src/Tests/UserCancelTest.php b/core/modules/user/src/Tests/UserCancelTest.php
index 31ef075..a9890c4 100644
--- a/core/modules/user/src/Tests/UserCancelTest.php
+++ b/core/modules/user/src/Tests/UserCancelTest.php
@@ -189,7 +189,7 @@ function testUserBlockUnpublish() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $this->config('user.settings')->set('cancel_method', 'user_cancel_block_unpublish')->save();
     // Create comment field on page.
-    \Drupal::service('comment.manager')->addDefaultField('node', 'page');
+    \Drupal::service('comment.manager')->commentDefaultFieldTrait('node', 'page');
 
     // Create a user.
     $account = $this->drupalCreateUser(array('cancel account'));
@@ -311,7 +311,7 @@ function testUserDelete() {
     $this->config('user.settings')->set('cancel_method', 'user_cancel_delete')->save();
     \Drupal::service('module_installer')->install(array('comment'));
     $this->resetAll();
-    $this->container->get('comment.manager')->addDefaultField('node', 'page');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'page');
 
     // Create a user.
     $account = $this->drupalCreateUser(array('cancel account', 'post comments', 'skip comment approval'));
diff --git a/core/modules/user/src/Tests/UserSignatureTest.php b/core/modules/user/src/Tests/UserSignatureTest.php
index b70c91d..0c421d9 100644
--- a/core/modules/user/src/Tests/UserSignatureTest.php
+++ b/core/modules/user/src/Tests/UserSignatureTest.php
@@ -32,7 +32,7 @@ protected function setUp() {
     // Create Basic page node type.
     $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
     // Add a comment field with commenting enabled by default.
-    $this->container->get('comment.manager')->addDefaultField('node', 'page');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'page');
 
     // Prefetch and create text formats.
     $this->filtered_html_format = entity_create('filter_format', array(
diff --git a/core/modules/views/src/Tests/DefaultViewsTest.php b/core/modules/views/src/Tests/DefaultViewsTest.php
index 43aae1f..fe363c6 100644
--- a/core/modules/views/src/Tests/DefaultViewsTest.php
+++ b/core/modules/views/src/Tests/DefaultViewsTest.php
@@ -81,7 +81,7 @@ protected function setUp() {
     // Create a time in the past for the archive.
     $time = REQUEST_TIME - 3600;
 
-    $this->container->get('comment.manager')->addDefaultField('node', 'page');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'page');
 
     $this->container->get('views.views_data')->clear();
 
diff --git a/core/modules/views/src/Tests/Entity/FieldEntityTest.php b/core/modules/views/src/Tests/Entity/FieldEntityTest.php
index d01ba1d..f9755fa 100644
--- a/core/modules/views/src/Tests/Entity/FieldEntityTest.php
+++ b/core/modules/views/src/Tests/Entity/FieldEntityTest.php
@@ -41,7 +41,7 @@ public function testGetEntity() {
     $account = entity_create('user', array('name' => $this->randomMachineName(), 'bundle' => 'user'));
     $account->save();
     $this->drupalCreateContentType(array('type' => 'page'));
-    $this->container->get('comment.manager')->addDefaultField('node', 'page');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'page');
     // Force a flush of the in-memory storage.
     $this->container->get('views.views_data')->clear();
 
diff --git a/core/modules/views/src/Tests/Handler/HandlerAllTest.php b/core/modules/views/src/Tests/Handler/HandlerAllTest.php
index ba83c54..efe205d 100644
--- a/core/modules/views/src/Tests/Handler/HandlerAllTest.php
+++ b/core/modules/views/src/Tests/Handler/HandlerAllTest.php
@@ -48,7 +48,7 @@ class HandlerAllTest extends HandlerTestBase {
    */
   public function testHandlers() {
     $this->drupalCreateContentType(array('type' => 'article'));
-    $this->container->get('comment.manager')->addDefaultField('node', 'article');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'article');
 
     $object_types = array_keys(ViewExecutable::getHandlerTypes());
     foreach ($this->container->get('views.views_data')->get() as $base_table => $info) {
diff --git a/core/modules/views/src/Tests/Handler/HandlerTest.php b/core/modules/views/src/Tests/Handler/HandlerTest.php
index f08acc2..9b3e231 100644
--- a/core/modules/views/src/Tests/Handler/HandlerTest.php
+++ b/core/modules/views/src/Tests/Handler/HandlerTest.php
@@ -37,7 +37,7 @@ class HandlerTest extends ViewTestBase {
   protected function setUp() {
     parent::setUp();
     $this->drupalCreateContentType(array('type' => 'page'));
-    $this->container->get('comment.manager')->addDefaultField('node', 'page');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'page');
     $this->enableViewsTestModule();
   }
 
diff --git a/core/modules/views/src/Tests/ViewExecutableTest.php b/core/modules/views/src/Tests/ViewExecutableTest.php
index 4b0e73f..4ec5754 100644
--- a/core/modules/views/src/Tests/ViewExecutableTest.php
+++ b/core/modules/views/src/Tests/ViewExecutableTest.php
@@ -86,7 +86,7 @@ protected function setUpFixtures() {
       'type' => 'page',
       'name' => 'Page',
     ))->save();
-    $this->container->get('comment.manager')->addDefaultField('node', 'page');
+    $this->container->get('comment.manager')->commentDefaultFieldTrait('node', 'page');
     parent::setUpFixtures();
 
     $this->installConfig(array('filter'));