diff --git a/core/lib/Drupal/Core/Entity/EntityFormControllerNG.php b/core/lib/Drupal/Core/Entity/EntityFormControllerNG.php
index ef9bc89..41d44e9 100644
--- a/core/lib/Drupal/Core/Entity/EntityFormControllerNG.php
+++ b/core/lib/Drupal/Core/Entity/EntityFormControllerNG.php
@@ -78,7 +78,7 @@ public function buildEntity(array $form, array &$form_state) {
     $translation = $entity->getTranslation($this->getFormLangcode($form_state), FALSE);
     $definitions = $translation->getPropertyDefinitions();
     foreach ($values_excluding_fields as $key => $value) {
-      if (isset($definitions[$key])) {
+      if (isset($definitions[$key]) || $entity instanceof EntityBCDecorator) {
         $translation->$key = $value;
       }
     }
diff --git a/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php b/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
index 7749651..b91bdcf 100644
--- a/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
@@ -36,7 +36,7 @@ public static function getInfo() {
     return array(
       'name' => ' Display: Block',
       'description' => 'Tests the block display plugin.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/comment/comment.views.inc b/core/modules/comment/comment.views.inc
index 8f5b186..9886c67 100644
--- a/core/modules/comment/comment.views.inc
+++ b/core/modules/comment/comment.views.inc
@@ -118,8 +118,8 @@ function comment_views_data() {
 
   // mail
   $data['comment']['mail'] = array(
-    'title' => t('Mail'),
-    'help' => t('Email of user that posted the comment. Will be empty if the author is a registered user.'),
+    'title' => t('E-mail'),
+    'help' => t('E-mail of user that posted the comment. Will be empty if the author is a registered user.'),
     'field' => array(
       'id' => 'standard',
      ),
@@ -240,7 +240,7 @@ function comment_views_data() {
 
   // status (approved or not)
   $data['comment']['status'] = array(
-    'title' => t('Approved'),
+    'title' => t('Approved status'),
     'help' => t('Whether the comment is approved (or still in the moderation queue).'),
     'field' => array(
       'id' => 'boolean',
@@ -250,7 +250,7 @@ function comment_views_data() {
     ),
     'filter' => array(
       'id' => 'boolean',
-      'label' => t('Approved comment'),
+      'label' => t('Approved comment status'),
       'type' => 'yes-no',
     ),
     'sort' => array(
@@ -258,46 +258,46 @@ function comment_views_data() {
     ),
   );
 
-  // link to view comment
+  // Link to view comment.
   $data['comment']['view_comment'] = array(
     'field' => array(
-      'title' => t('View link'),
+      'title' => t('Link to comment'),
       'help' => t('Provide a simple link to view the comment.'),
       'id' => 'comment_link',
     ),
   );
 
-  // link to edit comment
+  // Link to edit comment.
   $data['comment']['edit_comment'] = array(
     'field' => array(
-      'title' => t('Edit link'),
+      'title' => t('Link to edit comment'),
       'help' => t('Provide a simple link to edit the comment.'),
       'id' => 'comment_link_edit',
     ),
   );
 
-  // link to delete comment
+  // Link to delete comment.
   $data['comment']['delete_comment'] = array(
     'field' => array(
-      'title' => t('Delete link'),
+      'title' => t('Link to delete comment'),
       'help' => t('Provide a simple link to delete the comment.'),
       'id' => 'comment_link_delete',
     ),
   );
 
-  // link to approve comment
+  // Link to approve comment.
   $data['comment']['approve_comment'] = array(
     'field' => array(
-      'title' => t('Approve link'),
+      'title' => t('Link to approve comment'),
       'help' => t('Provide a simple link to approve the comment.'),
       'id' => 'comment_link_approve',
     ),
   );
 
-  // link to reply to comment
+  // Link to reply to comment.
   $data['comment']['replyto_comment'] = array(
     'field' => array(
-      'title' => t('Reply-to link'),
+      'title' => t('Link to reply-to comment'),
       'help' => t('Provide a simple link to reply to the comment.'),
       'id' => 'comment_link_reply',
     ),
@@ -470,7 +470,7 @@ function comment_views_data() {
     'title' => t('Last comment CID'),
     'help' => t('Display the last comment of a node'),
     'relationship' => array(
-      'title' => t('Last Comment'),
+      'title' => t('Last comment'),
       'help' => t('The last comment of a node.'),
       'group' => t('Comment'),
       'base' => 'comment',
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/ArgumentUserUIDTest.php b/core/modules/comment/lib/Drupal/comment/Tests/Views/ArgumentUserUIDTest.php
index 41fae33..8234cb5 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/Views/ArgumentUserUIDTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/Views/ArgumentUserUIDTest.php
@@ -23,7 +23,7 @@ public static function getInfo() {
     return array(
       'name' => 'Comment: User UID Argument',
       'description' => 'Tests the user posted or commented argument handler.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php b/core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php
index 51de381..e614c1e 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php
@@ -25,7 +25,7 @@ public static function getInfo() {
     return array(
       'name' => 'Comment: User UID Filter',
       'description' => 'Tests the user posted or commented filter handler.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/RowRssTest.php b/core/modules/comment/lib/Drupal/comment/Tests/Views/RowRssTest.php
index 7da9d08..d0cd727 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/Views/RowRssTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/Views/RowRssTest.php
@@ -25,7 +25,7 @@ public static function getInfo() {
     return array(
       'name' => 'Comment: Rss Row',
       'description' => 'Tests the comment rss row plugin.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php b/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php
index 7170030..07b5308 100644
--- a/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php
+++ b/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php
@@ -32,7 +32,7 @@ public static function getInfo() {
     return array(
       'name' => 'Contact: Field views data',
       'description' => 'Tests which checks that no fieldapi fields are added on contact.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/Views/SelectionTest.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/Views/SelectionTest.php
index 03a57bc..6998209 100644
--- a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/Views/SelectionTest.php
+++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/Views/SelectionTest.php
@@ -20,7 +20,7 @@ public static function getInfo() {
     return array(
       'name' => 'Entity Reference: Selection handler',
       'description' => 'Tests entity reference selection handler provided by Views.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/field/lib/Drupal/field/Tests/Views/ApiDataTest.php b/core/modules/field/lib/Drupal/field/Tests/Views/ApiDataTest.php
index 2d5544f..1f4afe8 100644
--- a/core/modules/field/lib/Drupal/field/Tests/Views/ApiDataTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/Views/ApiDataTest.php
@@ -21,7 +21,7 @@ public static function getInfo() {
     return array(
       'name' => 'Field: Views Data',
       'description' => 'Tests the Field Views data.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/field/lib/Drupal/field/Tests/Views/HandlerFieldFieldTest.php b/core/modules/field/lib/Drupal/field/Tests/Views/HandlerFieldFieldTest.php
index aa09bd7..5e50b88 100644
--- a/core/modules/field/lib/Drupal/field/Tests/Views/HandlerFieldFieldTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/Views/HandlerFieldFieldTest.php
@@ -32,7 +32,7 @@ public static function getInfo() {
     return array(
       'name' => 'Field: Field handler',
       'description' => 'Tests the field itself of the Field integration.',
-      'group' => 'Views Modules'
+      'group' => 'Views module integration'
     );
   }
 
diff --git a/core/modules/history/lib/Drupal/history/Tests/Views/HistoryTimestampTest.php b/core/modules/history/lib/Drupal/history/Tests/Views/HistoryTimestampTest.php
index 1b6d595..d92d024 100644
--- a/core/modules/history/lib/Drupal/history/Tests/Views/HistoryTimestampTest.php
+++ b/core/modules/history/lib/Drupal/history/Tests/Views/HistoryTimestampTest.php
@@ -35,7 +35,7 @@ public static function getInfo() {
     return array(
       'name' => 'History Integration',
       'description' => 'Tests the history timestamp handlers.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/FieldTypeTest.php b/core/modules/node/lib/Drupal/node/Tests/Views/FieldTypeTest.php
index 0f89752..3b92fb9 100644
--- a/core/modules/node/lib/Drupal/node/Tests/Views/FieldTypeTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/Views/FieldTypeTest.php
@@ -23,7 +23,7 @@ public static function getInfo() {
     return array(
       'name' => 'Node: Node Type field',
       'description' => 'Tests the Drupal\node\Plugin\views\field\Type handler.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/FilterUidRevisionTest.php b/core/modules/node/lib/Drupal/node/Tests/Views/FilterUidRevisionTest.php
index 5931094..c132c48 100644
--- a/core/modules/node/lib/Drupal/node/Tests/Views/FilterUidRevisionTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/Views/FilterUidRevisionTest.php
@@ -23,7 +23,7 @@ public static function getInfo() {
     return array(
       'name' => 'Node: User has revision Filter',
       'description' => 'Tests the node_uid_revision handler.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/RevisionRelationships.php b/core/modules/node/lib/Drupal/node/Tests/Views/RevisionRelationships.php
index b798799..deea0c5 100644
--- a/core/modules/node/lib/Drupal/node/Tests/Views/RevisionRelationships.php
+++ b/core/modules/node/lib/Drupal/node/Tests/Views/RevisionRelationships.php
@@ -38,7 +38,7 @@ public static function getInfo() {
     return array(
       'name' => 'Node: Revision integration',
       'description' => 'Tests the integration of node_revision table of node module',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/StatusExtraTest.php b/core/modules/node/lib/Drupal/node/Tests/Views/StatusExtraTest.php
index 8663117..cb16017 100644
--- a/core/modules/node/lib/Drupal/node/Tests/Views/StatusExtraTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/Views/StatusExtraTest.php
@@ -25,7 +25,7 @@ public static function getInfo() {
     return array(
       'name' => 'Node: Status extra filter',
       'description' => 'Tests the node.status_extra filter handler.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/node/node.views.inc b/core/modules/node/node.views.inc
index e83232e..cd6575e 100644
--- a/core/modules/node/node.views.inc
+++ b/core/modules/node/node.views.inc
@@ -134,7 +134,7 @@ function node_views_data() {
 
   // published status
   $data['node']['status'] = array(
-    'title' => t('Published'),
+    'title' => t('Published status'),
     'help' => t('Whether or not the content is published.'),
     'field' => array(
       'id' => 'boolean',
@@ -144,7 +144,7 @@ function node_views_data() {
     ),
     'filter' => array(
       'id' => 'boolean',
-      'label' => t('Published'),
+      'label' => t('Published status'),
       'type' => 'yes-no',
       'use_equal' => TRUE, // Use status = 1 instead of status <> 0 in WHERE statment
     ),
@@ -155,18 +155,18 @@ function node_views_data() {
 
   // published status + extra
   $data['node']['status_extra'] = array(
-    'title' => t('Published or admin'),
+    'title' => t('Published status or admin user'),
     'help' => t('Filters out unpublished content if the current user cannot view it.'),
     'filter' => array(
       'field' => 'status',
       'id' => 'node_status',
-      'label' => t('Published or admin'),
+      'label' => t('Published status or admin user'),
     ),
   );
 
   // promote status
   $data['node']['promote'] = array(
-    'title' => t('Promoted to front page'),
+    'title' => t('Promoted to front page status'),
     'help' => t('Whether or not the content is promoted to the front page.'),
     'field' => array(
       'id' => 'boolean',
@@ -176,7 +176,7 @@ function node_views_data() {
     ),
     'filter' => array(
       'id' => 'boolean',
-      'label' => t('Promoted to front page'),
+      'label' => t('Promoted to front page status'),
       'type' => 'yes-no',
     ),
     'sort' => array(
@@ -186,7 +186,7 @@ function node_views_data() {
 
   // sticky
   $data['node']['sticky'] = array(
-    'title' => t('Sticky'), // The item it appears as on the UI,
+    'title' => t('Sticky status'),
     'help' => t('Whether or not the content is sticky.'), // The help that appears on the UI,
      // Information for displaying a title as a field
     'field' => array(
@@ -197,7 +197,7 @@ function node_views_data() {
     ),
     'filter' => array(
       'id' => 'boolean',
-      'label' => t('Sticky'),
+      'label' => t('Sticky status'),
       'type' => 'yes-no',
     ),
     'sort' => array(
@@ -245,7 +245,7 @@ function node_views_data() {
 
   $data['views_entity_node']['view_node'] = array(
     'field' => array(
-      'title' => t('Link'),
+      'title' => t('Link to content'),
       'help' => t('Provide a simple link to the content.'),
       'id' => 'node_link',
     ),
@@ -253,7 +253,7 @@ function node_views_data() {
 
   $data['views_entity_node']['edit_node'] = array(
     'field' => array(
-      'title' => t('Edit link'),
+      'title' => t('Link to edit content'),
       'help' => t('Provide a simple link to edit the content.'),
       'id' => 'node_link_edit',
     ),
@@ -261,7 +261,7 @@ function node_views_data() {
 
   $data['views_entity_node']['delete_node'] = array(
     'field' => array(
-      'title' => t('Delete link'),
+      'title' => t('Link to delete content'),
       'help' => t('Provide a simple link to delete the content.'),
       'id' => 'node_link_delete',
     ),
@@ -390,7 +390,7 @@ function node_views_data() {
     'title' => t('Author uid'),
     'help' => t('The user authoring the content. If you need more fields than the uid add the content: author relationship'),
     'relationship' => array(
-      'title' => t('Author'),
+      'title' => t('Content author'),
       'help' => t('Relate content to the user who created it.'),
       'id' => 'standard',
       'base' => 'users',
@@ -448,7 +448,7 @@ function node_views_data() {
     ),
   );
 
-  // uid field for node revision
+  // UID field for node revision.
   $data['node_revision']['uid'] = array(
     'title' => t('User'),
     'help' => t('Relate a content revision to the user who created the revision.'),
@@ -593,7 +593,7 @@ function node_views_data() {
 
   $data['node_revision']['link_to_revision'] = array(
     'field' => array(
-      'title' => t('Link'),
+      'title' => t('Link to revision'),
       'help' => t('Provide a simple link to the revision.'),
       'id' => 'node_revision_link',
       'click sortable' => FALSE,
@@ -602,7 +602,7 @@ function node_views_data() {
 
   $data['node_revision']['revert_revision'] = array(
     'field' => array(
-      'title' => t('Revert link'),
+      'title' => t('Link to revert revision'),
       'help' => t('Provide a simple link to revert to the revision.'),
       'id' => 'node_revision_link_revert',
       'click sortable' => FALSE,
@@ -611,7 +611,7 @@ function node_views_data() {
 
   $data['node_revision']['delete_revision'] = array(
     'field' => array(
-      'title' => t('Delete link'),
+      'title' => t('Link to delete revision'),
       'help' => t('Provide a simple link to delete the content revision.'),
       'id' => 'node_revision_link_delete',
       'click sortable' => FALSE,
diff --git a/core/modules/statistics/lib/Drupal/statistics/Tests/Views/IntegrationTest.php b/core/modules/statistics/lib/Drupal/statistics/Tests/Views/IntegrationTest.php
index 9593c7b..acb85f2 100644
--- a/core/modules/statistics/lib/Drupal/statistics/Tests/Views/IntegrationTest.php
+++ b/core/modules/statistics/lib/Drupal/statistics/Tests/Views/IntegrationTest.php
@@ -50,7 +50,7 @@ public static function getInfo() {
     return array(
       'name' => 'Statistics: Integration tests',
       'description' => 'Tests basic integration of views data from the statistics module.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipNodeTermDataTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipNodeTermDataTest.php
index 44147ad..0dbe0c2 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipNodeTermDataTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipNodeTermDataTest.php
@@ -23,7 +23,7 @@ public static function getInfo() {
     return array(
       'name' => 'Taxonomy: Node term data Relationship',
       'description' => 'Tests the taxonomy term on node relationship handler.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipRepresentativeNode.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipRepresentativeNode.php
index 1672c26..dbe4b3e 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipRepresentativeNode.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipRepresentativeNode.php
@@ -23,7 +23,7 @@ public static function getInfo() {
     return array(
       'name' => 'Taxonomy: Representative Node Relationship',
       'description' => 'Tests the representative node relationship for terms.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/Views/TranslationLinkTest.php b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/Views/TranslationLinkTest.php
index 4c7868b..7c9788e 100644
--- a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/Views/TranslationLinkTest.php
+++ b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/Views/TranslationLinkTest.php
@@ -36,7 +36,7 @@ public static function getInfo() {
     return array(
       'name' => 'Entity Translation: Link field',
       'description' => 'Tests the Entity translation overview link field handler.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/AccessPermissionTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/AccessPermissionTest.php
index 9e85182..a71529b 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/AccessPermissionTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/AccessPermissionTest.php
@@ -27,7 +27,7 @@ public static function getInfo() {
     return array(
       'name' => 'User: Access permission',
       'description' => 'Tests views permission access plugin.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/AccessRoleTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/AccessRoleTest.php
index 10b4687..fc4a12e 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/AccessRoleTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/AccessRoleTest.php
@@ -27,7 +27,7 @@ public static function getInfo() {
     return array(
       'name' => 'User: Access role',
       'description' => 'Tests views role access plugin.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentDefaultTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentDefaultTest.php
index a52aecd..24951e7 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentDefaultTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentDefaultTest.php
@@ -23,7 +23,7 @@ public static function getInfo() {
     return array(
       'name' => 'User: Argument default',
       'description' => 'Tests user argument default plugin.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentValidateTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentValidateTest.php
index fcc3055..0d89d47 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentValidateTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentValidateTest.php
@@ -23,7 +23,7 @@ public static function getInfo() {
     return array(
       'name' => 'User: Argument validator',
       'description' => 'Tests user argument validator.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerArgumentUserUidTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerArgumentUserUidTest.php
index 9d0f30f..24be6f8 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerArgumentUserUidTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerArgumentUserUidTest.php
@@ -23,7 +23,7 @@ public static function getInfo() {
     return array(
       'name' => 'User: Uid Argument',
       'description' => 'Tests the handler of the user: uid Argument.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldRoleTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldRoleTest.php
index f85d7fa..55ec424 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldRoleTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldRoleTest.php
@@ -25,7 +25,7 @@ public static function getInfo() {
     return array(
       'name' => 'User: Role Field',
       'description' => 'Tests the handler of the user: role field.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldUserNameTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldUserNameTest.php
index e7ba95a..3ff4e23 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldUserNameTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldUserNameTest.php
@@ -25,7 +25,7 @@ public static function getInfo() {
     return array(
       'name' => 'User: Name Field',
       'description' => 'Tests the handler of the user: name field.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php
index cc0d38f..4e9b95a 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php
@@ -58,7 +58,7 @@ public static function getInfo() {
     return array(
       'name' => 'User: Name Filter',
       'description' => 'Tests the handler of the user: name filter',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/RelationshipRepresentativeNode.php b/core/modules/user/lib/Drupal/user/Tests/Views/RelationshipRepresentativeNode.php
index 9c75e34..34a0d83 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/RelationshipRepresentativeNode.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/RelationshipRepresentativeNode.php
@@ -23,7 +23,7 @@ public static function getInfo() {
     return array(
       'name' => 'User: Representative Node Relationship',
       'description' => 'Tests the representative node relationship for users.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }
 
diff --git a/core/modules/user/user.views.inc b/core/modules/user/user.views.inc
index 4107938..69398ee 100644
--- a/core/modules/user/user.views.inc
+++ b/core/modules/user/user.views.inc
@@ -116,8 +116,8 @@ function user_views_data() {
   // mail
   // Note that this field implements field level access control.
   $data['users']['mail'] = array(
-    'title' => t('E-mail'), // The item it appears as on the UI,
-    'help' => t('Email address for a given user. This field is normally not shown to users, so be cautious when using it.'), // The help that appears on the UI,
+    'title' => t('E-mail'),
+    'help' => t('E-mail address for a given user. This field is normally not shown to users, so be cautious when using it.'),
     'field' => array(
       'id' => 'user_mail',
     ),
@@ -153,7 +153,7 @@ function user_views_data() {
   // link
   $data['users']['view_user'] = array(
     'field' => array(
-      'title' => t('Link'),
+      'title' => t('Link to user'),
       'help' => t('Provide a simple link to the user.'),
       'id' => 'user_link',
       'click sortable' => FALSE,
@@ -261,7 +261,7 @@ function user_views_data() {
 
   // active status
   $data['users']['status'] = array(
-    'title' => t('Active'), // The item it appears as on the UI,
+    'title' => t('Active status'),
     'help' => t('Whether a user is active or blocked.'), // The help that appears on the UI,
      // Information for displaying a title as a field
     'field' => array(
@@ -308,7 +308,7 @@ function user_views_data() {
 
   $data['users']['edit_node'] = array(
     'field' => array(
-      'title' => t('Edit link'),
+      'title' => t('Link to edit user'),
       'help' => t('Provide a simple link to edit the user.'),
       'id' => 'user_link_edit',
       'click sortable' => FALSE,
@@ -317,7 +317,7 @@ function user_views_data() {
 
   $data['users']['cancel_node'] = array(
     'field' => array(
-      'title' => t('Cancel link'),
+      'title' => t('Link to cancel user'),
       'help' => t('Provide a simple link to cancel the user.'),
       'id' => 'user_link_cancel',
       'click sortable' => FALSE,
diff --git a/core/modules/views/lib/Drupal/views/Tests/Entity/FieldEntityTest.php b/core/modules/views/lib/Drupal/views/Tests/Entity/FieldEntityTest.php
index 0a0c07c..87b4fbd 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Entity/FieldEntityTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Entity/FieldEntityTest.php
@@ -32,7 +32,7 @@ public static function getInfo() {
     return array(
       'name' => 'Field: Entity Api Integration',
       'description' => 'Tests the field plugin base integration with the entity system.',
-      'group' => 'Views Modules',
+      'group' => 'Views module integration',
     );
   }