diff --git a/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php b/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php
index 4650bad..f6c5b69 100644
--- a/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php
+++ b/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php
@@ -20,7 +20,7 @@ class MultiStepNodeFormBasicOptionsTest extends NodeTestBase {
    *
    * @var string
    */
-  protected $field_name;
+  protected $fieldName;
 
   /**
    * Tests changing the default values of basic options to ensure they persist.
@@ -31,9 +31,9 @@ function testMultiStepNodeFormBasicOptions() {
     $this->drupalLogin($web_user);
 
     // Create an unlimited cardinality field.
-    $this->field_name = Unicode::strtolower($this->randomMachineName());
+    $this->fieldName = Unicode::strtolower($this->randomMachineName());
     entity_create('field_storage_config', array(
-      'field_name' => $this->field_name,
+      'field_name' => $this->fieldName,
       'entity_type' => 'node',
       'type' => 'text',
       'cardinality' => -1,
@@ -41,13 +41,13 @@ function testMultiStepNodeFormBasicOptions() {
 
     // Attach an instance of the field to the page content type.
     entity_create('field_config', array(
-      'field_name' => $this->field_name,
+      'field_name' => $this->fieldName,
       'entity_type' => 'node',
       'bundle' => 'page',
       'label' => $this->randomMachineName() . '_label',
     ))->save();
     entity_get_form_display('node', 'page', 'default')
-      ->setComponent($this->field_name, array(
+      ->setComponent($this->fieldName, array(
         'type' => 'text_textfield',
       ))
       ->save();
@@ -56,7 +56,7 @@ function testMultiStepNodeFormBasicOptions() {
       'title[0][value]' => 'a',
       'promote[value]' => FALSE,
       'sticky[value]' => 1,
-      "{$this->field_name}[0][value]" => $this->randomString(32),
+      "{$this->fieldName}[0][value]" => $this->randomString(32),
     );
     $this->drupalPostForm('node/add/page', $edit, t('Add another item'));
     $this->assertNoFieldChecked('edit-promote-value', 'Promote stayed unchecked');
diff --git a/core/modules/node/src/Tests/NodeAccessBaseTableTest.php b/core/modules/node/src/Tests/NodeAccessBaseTableTest.php
index d5e4dd4..64d3fd9 100644
--- a/core/modules/node/src/Tests/NodeAccessBaseTableTest.php
+++ b/core/modules/node/src/Tests/NodeAccessBaseTableTest.php
@@ -30,6 +30,15 @@ class NodeAccessBaseTableTest extends NodeTestBase {
    */
   protected $profile = 'standard';
 
+  /**
+   * An array (keyed by uid and nid) to track which nodes are 'private'.
+   *
+   * For each user ID/node ID, $nodes[$uid][$nid] = $is_private.
+   *
+   * @var array
+   */
+  protected $nodesByUser = array();
+
   protected function setUp() {
     parent::setUp();
 
@@ -57,8 +66,7 @@ function testNodeAccessBasic() {
     $num_simple_users = 2;
     $simple_users = array();
 
-    // nodes keyed by uid and nid: $nodes[$uid][$nid] = $is_private;
-    $this->nodesByUser = array();
+
     $titles = array(); // Titles keyed by nid
     $private_nodes = array(); // Array of nids marked private.
     for ($i = 0; $i < $num_simple_users; $i++) {
@@ -147,11 +155,11 @@ function testNodeAccessBasic() {
   protected function assertTaxonomyPage($is_admin) {
     foreach (array($this->publicTid, $this->privateTid) as $tid_is_private => $tid) {
       $this->drupalGet("taxonomy/term/$tid");
-      $this->nids_visible = array();
+      $nids_visible = array();
       foreach ($this->xpath("//a[text()='Read more']") as $link) {
         // See also testTranslationRendering() in NodeTranslationUITest.
         $this->assertTrue(preg_match('|node/(\d+)$|', (string) $link['href'], $matches), 'Read more points to a node');
-        $this->nids_visible[$matches[1]] = TRUE;
+        $nids_visible[$matches[1]] = TRUE;
       }
       foreach ($this->nodesByUser as $uid => $data) {
         foreach ($data as $nid => $is_private) {
@@ -163,10 +171,10 @@ protected function assertTaxonomyPage($is_admin) {
           if (!$is_admin && $tid_is_private) {
             $should_be_visible = $should_be_visible && $uid == $this->webUser->id();
           }
-          $this->assertIdentical(isset($this->nids_visible[$nid]), $should_be_visible, strtr('A %private node by user %uid is %visible for user %current_uid on the %tid_is_private page.', array(
+          $this->assertIdentical(isset($nids_visible[$nid]), $should_be_visible, strtr('A %private node by user %uid is %visible for user %current_uid on the %tid_is_private page.', array(
             '%private' => $is_private ? 'private' : 'public',
             '%uid' => $uid,
-            '%visible' => isset($this->nids_visible[$nid]) ? 'visible' : 'not visible',
+            '%visible' => isset($nids_visible[$nid]) ? 'visible' : 'not visible',
             '%current_uid' => $this->webUser->id(),
             '%tid_is_private' => $tid_is_private ? 'private' : 'public',
           )));
diff --git a/core/modules/node/src/Tests/NodeAccessFieldTest.php b/core/modules/node/src/Tests/NodeAccessFieldTest.php
index 43e7aaa..7d3f647 100644
--- a/core/modules/node/src/Tests/NodeAccessFieldTest.php
+++ b/core/modules/node/src/Tests/NodeAccessFieldTest.php
@@ -27,21 +27,21 @@ class NodeAccessFieldTest extends NodeTestBase {
    *
    * @var \Drupal\user\UserInterface
    */
-  protected $admin_user;
+  protected $adminUser;
 
   /**
    * A user with permission to manage content types and fields.
    *
    * @var \Drupal\user\UserInterface
    */
-  protected $content_admin_user;
+  protected $contentAdminUser;
 
   /**
    * The name of the created field.
    *
    * @var string
    */
-  protected $field_name;
+  protected $fieldName;
 
   protected function setUp() {
     parent::setUp();
@@ -49,26 +49,26 @@ protected function setUp() {
     node_access_rebuild();
 
     // Create some users.
-    $this->admin_user = $this->drupalCreateUser(array('access content', 'bypass node access'));
-    $this->content_admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer node fields'));
+    $this->adminUser = $this->drupalCreateUser(array('access content', 'bypass node access'));
+    $this->contentAdminUser = $this->drupalCreateUser(array('access content', 'administer content types', 'administer node fields'));
 
     // Add a custom field to the page content type.
-    $this->field_name = Unicode::strtolower($this->randomMachineName() . '_field_name');
+    $this->fieldName = Unicode::strtolower($this->randomMachineName() . '_field_name');
     entity_create('field_storage_config', array(
-      'field_name' => $this->field_name,
+      'field_name' => $this->fieldName,
       'entity_type' => 'node',
       'type' => 'text'
     ))->save();
     entity_create('field_config', array(
-      'field_name' => $this->field_name,
+      'field_name' => $this->fieldName,
       'entity_type' => 'node',
       'bundle' => 'page',
     ))->save();
     entity_get_display('node', 'page', 'default')
-      ->setComponent($this->field_name)
+      ->setComponent($this->fieldName)
       ->save();
     entity_get_form_display('node', 'page', 'default')
-      ->setComponent($this->field_name)
+      ->setComponent($this->fieldName)
       ->save();
   }
 
@@ -77,32 +77,32 @@ protected function setUp() {
    */
   function testNodeAccessAdministerField() {
     // Create a page node.
-    $field_data = array();
-    $value = $field_data[0]['value'] = $this->randomMachineName();
-    $node = $this->drupalCreateNode(array($this->field_name => $field_data));
+    $fieldData = array();
+    $value = $fieldData[0]['value'] = $this->randomMachineName();
+    $node = $this->drupalCreateNode(array($this->fieldName => $fieldData));
 
     // Log in as the administrator and confirm that the field value is present.
-    $this->drupalLogin($this->admin_user);
+    $this->drupalLogin($this->adminUser);
     $this->drupalGet('node/' . $node->id());
     $this->assertText($value, 'The saved field value is visible to an administrator.');
 
     // Log in as the content admin and try to view the node.
-    $this->drupalLogin($this->content_admin_user);
+    $this->drupalLogin($this->contentAdminUser);
     $this->drupalGet('node/' . $node->id());
     $this->assertText('Access denied', 'Access is denied for the content admin.');
 
     // Modify the field default as the content admin.
     $edit = array();
     $default = 'Sometimes words have two meanings';
-    $edit["default_value_input[{$this->field_name}][0][value]"] = $default;
+    $edit["default_value_input[{$this->fieldName}][0][value]"] = $default;
     $this->drupalPostForm(
-      "admin/structure/types/manage/page/fields/node.page.{$this->field_name}",
+      "admin/structure/types/manage/page/fields/node.page.{$this->fieldName}",
       $edit,
       t('Save settings')
     );
 
     // Log in as the administrator.
-    $this->drupalLogin($this->admin_user);
+    $this->drupalLogin($this->adminUser);
 
     // Confirm that the existing node still has the correct field value.
     $this->drupalGet('node/' . $node->id());
diff --git a/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php b/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php
index f73ac3b..1e86daa 100644
--- a/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php
+++ b/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php
@@ -37,14 +37,14 @@ class NodeAccessLanguageAwareCombinationTest extends NodeTestBase {
    *
    * @var \Drupal\user\Entity\UserInterface.
    */
-  protected $web_user;
+  protected $webUser;
 
   /**
    * User 1.
    *
    * @var \Drupal\user\Entity\UserInterface.
    */
-  protected $admin_user;
+  protected $adminUser;
 
   protected function setUp() {
     parent::setUp();
@@ -82,11 +82,11 @@ protected function setUp() {
     ConfigurableLanguage::createFromLangcode('ca')->save();
 
     // Create a normal authenticated user.
-    $this->web_user = $this->drupalCreateUser(array('access content'));
+    $this->webUser = $this->drupalCreateUser(array('access content'));
 
     // Load the user 1 user for later use as an admin user with permission to
     // see everything.
-    $this->admin_user = user_load(1);
+    $this->adminUser = user_load(1);
 
     // The node_access_test_language module allows individual translations of a
     // node to be marked private (not viewable by normal users), and the
@@ -195,75 +195,75 @@ function testNodeAccessLanguageAwareCombination() {
 
     // When the node and both translations are public, access should only be
     // denied when a translation that does not exist is requested.
-    $this->assertNodeAccess($expected_node_access, $this->nodes['public_both_public'], $this->web_user);
-    $this->assertNodeAccess($expected_node_access, $this->nodes['public_both_public'], $this->web_user, 'hu');
-    $this->assertNodeAccess($expected_node_access, $this->nodes['public_both_public'], $this->web_user, 'ca');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_both_public'], $this->web_user, 'en');
+    $this->assertNodeAccess($expected_node_access, $this->nodes['public_both_public'], $this->webUser);
+    $this->assertNodeAccess($expected_node_access, $this->nodes['public_both_public'], $this->webUser, 'hu');
+    $this->assertNodeAccess($expected_node_access, $this->nodes['public_both_public'], $this->webUser, 'ca');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_both_public'], $this->webUser, 'en');
 
     // If the node is marked private but both existing translations are not,
     // access should still be granted, because the grants are additive.
-    $this->assertNodeAccess($expected_node_access, $this->nodes['private_both_public'], $this->web_user);
-    $this->assertNodeAccess($expected_node_access, $this->nodes['private_both_public'], $this->web_user, 'hu');
-    $this->assertNodeAccess($expected_node_access, $this->nodes['private_both_public'], $this->web_user, 'ca');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_both_public'], $this->web_user, 'en');
+    $this->assertNodeAccess($expected_node_access, $this->nodes['private_both_public'], $this->webUser);
+    $this->assertNodeAccess($expected_node_access, $this->nodes['private_both_public'], $this->webUser, 'hu');
+    $this->assertNodeAccess($expected_node_access, $this->nodes['private_both_public'], $this->webUser, 'ca');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_both_public'], $this->webUser, 'en');
 
     // If the node is marked private, but a existing translation is public,
     // access should only be granted for the public translation. For a
     // translation that does not exist yet (English translation), the access is
     // denied. With the Hungarian translation marked as private, but the Catalan
     // translation public, the access is granted.
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_hu_private'], $this->web_user);
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_hu_private'], $this->web_user, 'hu');
-    $this->assertNodeAccess($expected_node_access, $this->nodes['public_hu_private'], $this->web_user, 'ca');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_hu_private'], $this->web_user, 'en');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_hu_private'], $this->webUser);
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_hu_private'], $this->webUser, 'hu');
+    $this->assertNodeAccess($expected_node_access, $this->nodes['public_hu_private'], $this->webUser, 'ca');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_hu_private'], $this->webUser, 'en');
 
     // With the Catalan translation marked as private, but the node public,
     // access is granted for the existing Hungarian translation, but not for the
     // Catalan nor the English ones.
-    $this->assertNodeAccess($expected_node_access, $this->nodes['public_ca_private'], $this->web_user);
-    $this->assertNodeAccess($expected_node_access, $this->nodes['public_ca_private'], $this->web_user, 'hu');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_ca_private'], $this->web_user, 'ca');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_ca_private'], $this->web_user, 'en');
+    $this->assertNodeAccess($expected_node_access, $this->nodes['public_ca_private'], $this->webUser);
+    $this->assertNodeAccess($expected_node_access, $this->nodes['public_ca_private'], $this->webUser, 'hu');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_ca_private'], $this->webUser, 'ca');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_ca_private'], $this->webUser, 'en');
 
     // With both translations marked as private, but the node public, access
     // should be denied in all cases.
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_both_private'], $this->web_user);
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_both_private'], $this->web_user, 'hu');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_both_private'], $this->web_user, 'ca');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_both_private'], $this->web_user, 'en');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_both_private'], $this->webUser);
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_both_private'], $this->webUser, 'hu');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_both_private'], $this->webUser, 'ca');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_both_private'], $this->webUser, 'en');
 
     // If the node and both its existing translations are private, access should
     // be denied in all cases.
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_both_private'], $this->web_user);
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_both_private'], $this->web_user, 'hu');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_both_private'], $this->web_user, 'ca');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_both_private'], $this->web_user, 'en');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_both_private'], $this->webUser);
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_both_private'], $this->webUser, 'hu');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_both_private'], $this->webUser, 'ca');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_both_private'], $this->webUser, 'en');
 
     // No access for all languages as the language aware node access module
     // denies access.
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_no_language_private'], $this->web_user);
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_no_language_private'], $this->web_user, 'hu');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_no_language_private'], $this->web_user, 'ca');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_no_language_private'], $this->web_user, 'en');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_no_language_private'], $this->webUser);
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_no_language_private'], $this->webUser, 'hu');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_no_language_private'], $this->webUser, 'ca');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_no_language_private'], $this->webUser, 'en');
 
     // Access only for request with no language defined.
-    $this->assertNodeAccess($expected_node_access, $this->nodes['public_no_language_public'], $this->web_user);
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_no_language_public'], $this->web_user, 'hu');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_no_language_public'], $this->web_user, 'ca');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_no_language_public'], $this->web_user, 'en');
+    $this->assertNodeAccess($expected_node_access, $this->nodes['public_no_language_public'], $this->webUser);
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_no_language_public'], $this->webUser, 'hu');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_no_language_public'], $this->webUser, 'ca');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['public_no_language_public'], $this->webUser, 'en');
 
     // No access for all languages as both node access modules deny access.
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_no_language_private'], $this->web_user);
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_no_language_private'], $this->web_user, 'hu');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_no_language_private'], $this->web_user, 'ca');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_no_language_private'], $this->web_user, 'en');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_no_language_private'], $this->webUser);
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_no_language_private'], $this->webUser, 'hu');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_no_language_private'], $this->webUser, 'ca');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_no_language_private'], $this->webUser, 'en');
 
     // No access for all languages as the non language aware node access module
     // denies access.
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_no_language_public'], $this->web_user);
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_no_language_public'], $this->web_user, 'hu');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_no_language_public'], $this->web_user, 'ca');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_no_language_public'], $this->web_user, 'en');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_no_language_public'], $this->webUser);
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_no_language_public'], $this->webUser, 'hu');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_no_language_public'], $this->webUser, 'ca');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_no_language_public'], $this->webUser, 'en');
 
 
     // Query the node table with the node access tag in several languages.
@@ -271,7 +271,7 @@ function testNodeAccessLanguageAwareCombination() {
     // Query with no language specified. The fallback (hu or und) will be used.
     $select = db_select('node', 'n')
     ->fields('n', array('nid'))
-    ->addMetaData('account', $this->web_user)
+    ->addMetaData('account', $this->webUser)
     ->addTag('node_access');
     $nids = $select->execute()->fetchAllAssoc('nid');
 
@@ -286,7 +286,7 @@ function testNodeAccessLanguageAwareCombination() {
     // Query with Hungarian (hu) specified.
     $select = db_select('node', 'n')
     ->fields('n', array('nid'))
-    ->addMetaData('account', $this->web_user)
+    ->addMetaData('account', $this->webUser)
     ->addMetaData('langcode', 'hu')
     ->addTag('node_access');
     $nids = $select->execute()->fetchAllAssoc('nid');
@@ -300,7 +300,7 @@ function testNodeAccessLanguageAwareCombination() {
     // Query with Catalan (ca) specified.
     $select = db_select('node', 'n')
     ->fields('n', array('nid'))
-    ->addMetaData('account', $this->web_user)
+    ->addMetaData('account', $this->webUser)
     ->addMetaData('langcode', 'ca')
     ->addTag('node_access');
     $nids = $select->execute()->fetchAllAssoc('nid');
@@ -314,7 +314,7 @@ function testNodeAccessLanguageAwareCombination() {
     // Query with German (de) specified.
     $select = db_select('node', 'n')
     ->fields('n', array('nid'))
-    ->addMetaData('account', $this->web_user)
+    ->addMetaData('account', $this->webUser)
     ->addMetaData('langcode', 'de')
     ->addTag('node_access');
     $nids = $select->execute()->fetchAllAssoc('nid');
@@ -326,7 +326,7 @@ function testNodeAccessLanguageAwareCombination() {
     // tag and no specific langcode.
     $select = db_select('node', 'n')
     ->fields('n', array('nid'))
-    ->addMetaData('account', $this->admin_user)
+    ->addMetaData('account', $this->adminUser)
     ->addTag('node_access');
     $nids = $select->execute()->fetchAllAssoc('nid');
 
@@ -337,7 +337,7 @@ function testNodeAccessLanguageAwareCombination() {
     // tag and langcode de.
     $select = db_select('node', 'n')
     ->fields('n', array('nid'))
-    ->addMetaData('account', $this->admin_user)
+    ->addMetaData('account', $this->adminUser)
     ->addMetaData('langcode', 'de')
     ->addTag('node_access');
     $nids = $select->execute()->fetchAllAssoc('nid');
diff --git a/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php b/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php
index ad82dea..64d1911 100644
--- a/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php
+++ b/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php
@@ -33,11 +33,18 @@ class NodeAccessLanguageAwareTest extends NodeTestBase {
   protected $nodes = array();
 
   /**
+   * A user with permission to bypass access content.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
+
+  /**
    * A normal authenticated user.
    *
    * @var \Drupal\user\UserInterface
    */
-  protected $web_user;
+  protected $webUser;
 
   protected function setUp() {
     parent::setUp();
@@ -69,11 +76,11 @@ protected function setUp() {
     node_access_rebuild();
 
     // Create a normal authenticated user.
-    $this->web_user = $this->drupalCreateUser(array('access content'));
+    $this->webUser = $this->drupalCreateUser(array('access content'));
 
     // Load the user 1 user for later use as an admin user with permission to
     // see everything.
-    $this->admin_user = user_load(1);
+    $this->adminUser = user_load(1);
 
     // Add Hungarian and Catalan.
     ConfigurableLanguage::createFromLangcode('hu')->save();
@@ -148,65 +155,65 @@ function testNodeAccessLanguageAware() {
     // When both Hungarian and Catalan are marked as public, access to the
     // Hungarian translation should be granted when no language is specified or
     // when the Hungarian translation is specified explicitly.
-    $this->assertNodeAccess($expected_node_access, $this->nodes['both_public'], $this->web_user);
-    $this->assertNodeAccess($expected_node_access, $this->nodes['both_public'], $this->web_user, 'hu');
+    $this->assertNodeAccess($expected_node_access, $this->nodes['both_public'], $this->webUser);
+    $this->assertNodeAccess($expected_node_access, $this->nodes['both_public'], $this->webUser, 'hu');
     // Access to the Catalan translation should also be granted.
-    $this->assertNodeAccess($expected_node_access, $this->nodes['both_public'], $this->web_user, 'ca');
+    $this->assertNodeAccess($expected_node_access, $this->nodes['both_public'], $this->webUser, 'ca');
     // There is no English translation, so a request to access the English
     // translation is denied.
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['both_public'], $this->web_user, 'en');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['both_public'], $this->webUser, 'en');
 
     // When Hungarian is marked as private, access to the Hungarian translation
     // should be denied when no language is specified or when the Hungarian
     // translation is specified explicitly.
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['hu_private'], $this->web_user);
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['hu_private'], $this->web_user, 'hu');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['hu_private'], $this->webUser);
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['hu_private'], $this->webUser, 'hu');
     // Access to the Catalan translation should be granted.
-    $this->assertNodeAccess($expected_node_access, $this->nodes['hu_private'], $this->web_user, 'ca');
+    $this->assertNodeAccess($expected_node_access, $this->nodes['hu_private'], $this->webUser, 'ca');
     // There is no English translation, so a request to access the English
     // translation is denied.
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['hu_private'], $this->web_user, 'en');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['hu_private'], $this->webUser, 'en');
 
     // When Catalan is marked as private, access to the Hungarian translation
     // should be granted when no language is specified or when the Hungarian
     // translation is specified explicitly.
-    $this->assertNodeAccess($expected_node_access, $this->nodes['ca_private'], $this->web_user);
-    $this->assertNodeAccess($expected_node_access, $this->nodes['ca_private'], $this->web_user, 'hu');
+    $this->assertNodeAccess($expected_node_access, $this->nodes['ca_private'], $this->webUser);
+    $this->assertNodeAccess($expected_node_access, $this->nodes['ca_private'], $this->webUser, 'hu');
     // Access to the Catalan translation should be granted.
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['ca_private'], $this->web_user, 'ca');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['ca_private'], $this->webUser, 'ca');
     // There is no English translation, so a request to access the English
     // translation is denied.
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['ca_private'], $this->web_user, 'en');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['ca_private'], $this->webUser, 'en');
 
     // When both translations are marked as private, access should be denied
     // regardless of the language specified.
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['both_private'], $this->web_user);
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['both_private'], $this->web_user, 'hu');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['both_private'], $this->web_user, 'ca');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['both_private'], $this->web_user, 'en');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['both_private'], $this->webUser);
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['both_private'], $this->webUser, 'hu');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['both_private'], $this->webUser, 'ca');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['both_private'], $this->webUser, 'en');
 
     // When no language is specified for a private node, access to every
     // language is denied.
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['no_language_private'], $this->web_user);
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['no_language_private'], $this->web_user, 'hu');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['no_language_private'], $this->web_user, 'ca');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['no_language_private'], $this->web_user, 'en');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['no_language_private'], $this->webUser);
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['no_language_private'], $this->webUser, 'hu');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['no_language_private'], $this->webUser, 'ca');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['no_language_private'], $this->webUser, 'en');
 
     // When no language is specified for a public node, access should be granted
     // only for the existing language (not specified), so only the request with
     // no language will give access, as this request will be made with the
     // langcode of the node, which is "not specified".
-    $this->assertNodeAccess($expected_node_access, $this->nodes['no_language_public'], $this->web_user);
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['no_language_public'], $this->web_user, 'hu');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['no_language_public'], $this->web_user, 'ca');
-    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['no_language_public'], $this->web_user, 'en');
+    $this->assertNodeAccess($expected_node_access, $this->nodes['no_language_public'], $this->webUser);
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['no_language_public'], $this->webUser, 'hu');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['no_language_public'], $this->webUser, 'ca');
+    $this->assertNodeAccess($expected_node_access_no_access, $this->nodes['no_language_public'], $this->webUser, 'en');
 
     // Query the node table with the node access tag in several languages.
 
     // Query with no language specified. The fallback (hu) will be used.
     $select = db_select('node', 'n')
     ->fields('n', array('nid'))
-    ->addMetaData('account', $this->web_user)
+    ->addMetaData('account', $this->webUser)
     ->addTag('node_access');
     $nids = $select->execute()->fetchAllAssoc('nid');
 
@@ -222,7 +229,7 @@ function testNodeAccessLanguageAware() {
     // Query with Hungarian (hu) specified.
     $select = db_select('node', 'n')
     ->fields('n', array('nid'))
-    ->addMetaData('account', $this->web_user)
+    ->addMetaData('account', $this->webUser)
     ->addMetaData('langcode', 'hu')
     ->addTag('node_access');
     $nids = $select->execute()->fetchAllAssoc('nid');
@@ -236,7 +243,7 @@ function testNodeAccessLanguageAware() {
     // Query with Catalan (ca) specified.
     $select = db_select('node', 'n')
     ->fields('n', array('nid'))
-    ->addMetaData('account', $this->web_user)
+    ->addMetaData('account', $this->webUser)
     ->addMetaData('langcode', 'ca')
     ->addTag('node_access');
     $nids = $select->execute()->fetchAllAssoc('nid');
@@ -250,7 +257,7 @@ function testNodeAccessLanguageAware() {
     // Query with German (de) specified.
     $select = db_select('node', 'n')
     ->fields('n', array('nid'))
-    ->addMetaData('account', $this->web_user)
+    ->addMetaData('account', $this->webUser)
     ->addMetaData('langcode', 'de')
     ->addTag('node_access');
     $nids = $select->execute()->fetchAllAssoc('nid');
@@ -262,7 +269,7 @@ function testNodeAccessLanguageAware() {
     // tag and no specific langcode.
     $select = db_select('node', 'n')
     ->fields('n', array('nid'))
-    ->addMetaData('account', $this->admin_user)
+    ->addMetaData('account', $this->adminUser)
     ->addTag('node_access');
     $nids = $select->execute()->fetchAllAssoc('nid');
 
@@ -273,7 +280,7 @@ function testNodeAccessLanguageAware() {
     // tag and langcode de.
     $select = db_select('node', 'n')
     ->fields('n', array('nid'))
-    ->addMetaData('account', $this->admin_user)
+    ->addMetaData('account', $this->adminUser)
     ->addMetaData('langcode', 'de')
     ->addTag('node_access');
     $nids = $select->execute()->fetchAllAssoc('nid');
diff --git a/core/modules/node/src/Tests/NodeAccessPagerTest.php b/core/modules/node/src/Tests/NodeAccessPagerTest.php
index 9b5299f..f9deff8 100644
--- a/core/modules/node/src/Tests/NodeAccessPagerTest.php
+++ b/core/modules/node/src/Tests/NodeAccessPagerTest.php
@@ -30,7 +30,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->web_user = $this->drupalCreateUser(array('access content', 'access comments', 'node test view'));
+    $this->webUser = $this->drupalCreateUser(array('access content', 'access comments', 'node test view'));
   }
 
   /**
@@ -55,7 +55,7 @@ public function testCommentPager() {
       $comment->save();
     }
 
-    $this->drupalLogin($this->web_user);
+    $this->drupalLogin($this->webUser);
 
     // View the node page. With the default 50 comments per page there should
     // be two pages (0, 1) but no third (2) page.
@@ -92,7 +92,7 @@ public function testForumPager() {
 
     // View the general discussion forum page. With the default 25 nodes per
     // page there should be two pages for 30 nodes, no more.
-    $this->drupalLogin($this->web_user);
+    $this->drupalLogin($this->webUser);
     $this->drupalGet('forum/' . $tid);
     $this->assertRaw('page=1');
     $this->assertNoRaw('page=2');
diff --git a/core/modules/node/src/Tests/NodeAccessRebuildTest.php b/core/modules/node/src/Tests/NodeAccessRebuildTest.php
index 0fee0ca..db1d8eb 100644
--- a/core/modules/node/src/Tests/NodeAccessRebuildTest.php
+++ b/core/modules/node/src/Tests/NodeAccessRebuildTest.php
@@ -13,12 +13,19 @@
  * @group node
  */
 class NodeAccessRebuildTest extends NodeTestBase {
+  /**
+   * A normal authenticated user.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $webUser;
+
   protected function setUp() {
     parent::setUp();
 
     $web_user = $this->drupalCreateUser(array('administer site configuration', 'access administration pages', 'access site reports'));
     $this->drupalLogin($web_user);
-    $this->web_user = $web_user;
+    $this->webUser = $web_user;
   }
 
   /**
diff --git a/core/modules/node/src/Tests/NodeAdminTest.php b/core/modules/node/src/Tests/NodeAdminTest.php
index d88d7db..52542c0 100644
--- a/core/modules/node/src/Tests/NodeAdminTest.php
+++ b/core/modules/node/src/Tests/NodeAdminTest.php
@@ -13,6 +13,39 @@
  * @group node
  */
 class NodeAdminTest extends NodeTestBase {
+  /**
+   * A user with permission to bypass access content.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
+
+  /**
+   * A regular user with the 'access content overview' permission.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $baseUser1;
+
+  /**
+   * A regular user with permission to view their own unpublished content.
+   *
+   * This user has both 'access content overview' and 'view own unpublished
+   * content' permissions.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $baseUser2;
+
+  /**
+   * A regular user with permission to bypass node access rules.
+   *
+   * This user has both 'access content overview' and 'bypass node access'
+   * permissions.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $baseUser3;
 
   /**
    * Modules to enable.
@@ -29,17 +62,17 @@ protected function setUp() {
     // correctly.
     user_role_revoke_permissions(DRUPAL_AUTHENTICATED_RID, array('view own unpublished content'));
 
-    $this->admin_user = $this->drupalCreateUser(array('access administration pages', 'access content overview', 'administer nodes', 'bypass node access'));
-    $this->base_user_1 = $this->drupalCreateUser(array('access content overview'));
-    $this->base_user_2 = $this->drupalCreateUser(array('access content overview', 'view own unpublished content'));
-    $this->base_user_3 = $this->drupalCreateUser(array('access content overview', 'bypass node access'));
+    $this->adminUser = $this->drupalCreateUser(array('access administration pages', 'access content overview', 'administer nodes', 'bypass node access'));
+    $this->baseUser1 = $this->drupalCreateUser(array('access content overview'));
+    $this->baseUser2 = $this->drupalCreateUser(array('access content overview', 'view own unpublished content'));
+    $this->baseUser3 = $this->drupalCreateUser(array('access content overview', 'bypass node access'));
   }
 
   /**
    * Tests that the table sorting works on the content admin pages.
    */
   function testContentAdminSort() {
-    $this->drupalLogin($this->admin_user);
+    $this->drupalLogin($this->adminUser);
 
     $changed = REQUEST_TIME;
     foreach (array('dd', 'aa', 'DD', 'bb', 'cc', 'CC', 'AA', 'BB') as $prefix) {
@@ -87,12 +120,12 @@ function testContentAdminSort() {
    * @see TaxonomyNodeFilterTestCase
    */
   function testContentAdminPages() {
-    $this->drupalLogin($this->admin_user);
+    $this->drupalLogin($this->adminUser);
 
     $nodes['published_page'] = $this->drupalCreateNode(array('type' => 'page'));
     $nodes['published_article'] = $this->drupalCreateNode(array('type' => 'article'));
-    $nodes['unpublished_page_1'] = $this->drupalCreateNode(array('type' => 'page', 'uid' => $this->base_user_1->id(), 'status' => 0));
-    $nodes['unpublished_page_2'] = $this->drupalCreateNode(array('type' => 'page', 'uid' => $this->base_user_2->id(), 'status' => 0));
+    $nodes['unpublished_page_1'] = $this->drupalCreateNode(array('type' => 'page', 'uid' => $this->baseUser1->id(), 'status' => 0));
+    $nodes['unpublished_page_2'] = $this->drupalCreateNode(array('type' => 'page', 'uid' => $this->baseUser2->id(), 'status' => 0));
 
     // Verify view, edit, and delete links for any content.
     $this->drupalGet('admin/content');
@@ -118,7 +151,7 @@ function testContentAdminPages() {
 
     // Verify no operation links are displayed for regular users.
     $this->drupalLogout();
-    $this->drupalLogin($this->base_user_1);
+    $this->drupalLogin($this->baseUser1);
     $this->drupalGet('admin/content');
     $this->assertResponse(200);
     $this->assertLinkByHref('node/' . $nodes['published_page']->id());
@@ -138,7 +171,7 @@ function testContentAdminPages() {
 
     // Verify unpublished content is displayed with permission.
     $this->drupalLogout();
-    $this->drupalLogin($this->base_user_2);
+    $this->drupalLogin($this->baseUser2);
     $this->drupalGet('admin/content');
     $this->assertResponse(200);
     $this->assertLinkByHref('node/' . $nodes['unpublished_page_2']->id());
@@ -156,7 +189,7 @@ function testContentAdminPages() {
 
     // Verify node access can be bypassed.
     $this->drupalLogout();
-    $this->drupalLogin($this->base_user_3);
+    $this->drupalLogin($this->baseUser3);
     $this->drupalGet('admin/content');
     $this->assertResponse(200);
     foreach ($nodes as $node) {
diff --git a/core/modules/node/src/Tests/NodeFormButtonsTest.php b/core/modules/node/src/Tests/NodeFormButtonsTest.php
index 462dc65..b5c2df5 100644
--- a/core/modules/node/src/Tests/NodeFormButtonsTest.php
+++ b/core/modules/node/src/Tests/NodeFormButtonsTest.php
@@ -14,17 +14,27 @@
  */
 class NodeFormButtonsTest extends NodeTestBase {
 
-  protected $web_user;
+  /**
+   * A normal logged in user.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $webUser;
 
-  protected $admin_user;
+  /**
+   * A user with permission to bypass access content.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
 
   protected function setUp() {
     parent::setUp();
 
     // Create a user that has no access to change the state of the node.
-    $this->web_user = $this->drupalCreateUser(array('create article content', 'edit own article content'));
+    $this->webUser = $this->drupalCreateUser(array('create article content', 'edit own article content'));
     // Create a user that has access to change the state of the node.
-    $this->admin_user = $this->drupalCreateUser(array('administer nodes', 'bypass node access'));
+    $this->adminUser = $this->drupalCreateUser(array('administer nodes', 'bypass node access'));
   }
 
   /**
@@ -33,7 +43,7 @@ protected function setUp() {
   function testNodeFormButtons() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     // Login as administrative user.
-    $this->drupalLogin($this->admin_user);
+    $this->drupalLogin($this->adminUser);
 
     // Verify the buttons on a node add form.
     $this->drupalGet('node/add/article');
@@ -72,7 +82,7 @@ function testNodeFormButtons() {
 
     // Create a node as a normal user.
     $this->drupalLogout();
-    $this->drupalLogin($this->web_user);
+    $this->drupalLogin($this->webUser);
 
     // Verify the buttons for a normal user.
     $this->drupalGet('node/add/article');
@@ -87,7 +97,7 @@ function testNodeFormButtons() {
     // Login as an administrator and unpublish the node that just
     // was created by the normal user.
     $this->drupalLogout();
-    $this->drupalLogin($this->admin_user);
+    $this->drupalLogin($this->adminUser);
     $this->drupalPostForm('node/' . $node_2->id() . '/edit', array(), t('Save and unpublish'));
     $node_storage->resetCache(array(2));
     $node_2 = $node_storage->load(2);
@@ -96,7 +106,7 @@ function testNodeFormButtons() {
     // Login again as the normal user, save the node and verify
     // it's still unpublished.
     $this->drupalLogout();
-    $this->drupalLogin($this->web_user);
+    $this->drupalLogin($this->webUser);
     $this->drupalPostForm('node/' . $node_2->id() . '/edit', array(), t('Save'));
     $node_storage->resetCache(array(2));
     $node_2 = $node_storage->load(2);
@@ -112,13 +122,13 @@ function testNodeFormButtons() {
       ->save();
 
     // Verify the buttons on a node add form for an administrator.
-    $this->drupalLogin($this->admin_user);
+    $this->drupalLogin($this->adminUser);
     $this->drupalGet('node/add/article');
     $this->assertButtons(array(t('Save as unpublished'), t('Save and publish')));
 
     // Verify the node is unpublished by default for a normal user.
     $this->drupalLogout();
-    $this->drupalLogin($this->web_user);
+    $this->drupalLogin($this->webUser);
     $edit = array('title[0][value]' => $this->randomString());
     $this->drupalPostForm('node/add/article', $edit, t('Save'));
     $node_3 = $node_storage->load(3);
diff --git a/core/modules/node/src/Tests/NodeQueryAlterTest.php b/core/modules/node/src/Tests/NodeQueryAlterTest.php
index a26dcd0..ea0ce7b 100644
--- a/core/modules/node/src/Tests/NodeQueryAlterTest.php
+++ b/core/modules/node/src/Tests/NodeQueryAlterTest.php
@@ -23,14 +23,25 @@ class NodeQueryAlterTest extends NodeTestBase {
 
   /**
    * User with permission to view content.
+   *
+   * @var \Drupal\user\UserInterface
    */
   protected $accessUser;
 
   /**
-   * User without permission to view content.
+   * A first user without permission to view content.
+   *
+   * @var \Drupal\user\UserInterface
    */
   protected $noAccessUser;
 
+  /**
+   * A second user without permission to view content.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $noAccessUser2;
+
   protected function setUp() {
     parent::setUp();
 
diff --git a/core/modules/node/src/Tests/NodeRevisionPermissionsTest.php b/core/modules/node/src/Tests/NodeRevisionPermissionsTest.php
index cd65dba..b3b3ecd 100644
--- a/core/modules/node/src/Tests/NodeRevisionPermissionsTest.php
+++ b/core/modules/node/src/Tests/NodeRevisionPermissionsTest.php
@@ -13,7 +13,21 @@
  * @group node
  */
 class NodeRevisionPermissionsTest extends NodeTestBase {
-  protected $node_revisions = array();
+  /**
+   * An array containing multiple revisions of multiple types of nodes.
+   *
+   * Each element of this array (whose key specifies a type of node) points
+   * to an array containing one node and four revisions of the same node.
+   *
+   * @var array
+   */
+  protected $nodeRevisions = array();
+
+  /**
+   * An array containing user accounts for testing purposes.
+   *
+   * @var array (of \Drupal\user\Entity\UserInterface)
+   */
   protected $accounts = array();
 
   // Map revision permission names to node revision access ops.
@@ -24,7 +38,7 @@ class NodeRevisionPermissionsTest extends NodeTestBase {
   );
 
   // Map revision permission names to node type revision access ops.
-  protected $type_map = array(
+  protected $typeMap = array(
     'view' => 'view page revisions',
     'update' => 'revert page revisions',
     'delete' => 'delete page revisions',
@@ -38,7 +52,7 @@ protected function setUp() {
     foreach ($types as $type) {
       // Create a node with several revisions.
       $nodes[$type] = $this->drupalCreateNode(array('type' => $type));
-      $this->node_revisions[$type][] = $nodes[$type];
+      $this->nodeRevisions[$type][] = $nodes[$type];
 
       for ($i = 0; $i < 3; $i++) {
         // Create a revision for the same nid and settings with a random log.
@@ -46,7 +60,7 @@ protected function setUp() {
         $revision->setNewRevision();
         $revision->revision_log = $this->randomMachineName(32);
         $revision->save();
-        $this->node_revisions[$type][] = $revision;
+        $this->nodeRevisions[$type][] = $revision;
       }
     }
   }
@@ -81,7 +95,7 @@ function testNodeRevisionAccessAnyType() {
     $normal_account->op = FALSE;
     $this->accounts[] = $normal_account;
     $accounts[] = $normal_account;
-    $revision = $this->node_revisions['page'][1];
+    $revision = $this->nodeRevisions['page'][1];
 
     $parameters = array(
       'op' => array_keys($this->map),
@@ -114,7 +128,7 @@ function testNodeRevisionAccessAnyType() {
    */
   function testNodeRevisionAccessPerType() {
     // Create three users, one with each revision permission.
-    foreach ($this->type_map as $op => $permission) {
+    foreach ($this->typeMap as $op => $permission) {
       // Create the user.
       $account = $this->drupalCreateUser(
         array(
@@ -129,32 +143,32 @@ function testNodeRevisionAccessPerType() {
     }
 
     $parameters = array(
-      'op' => array_keys($this->type_map),
+      'op' => array_keys($this->typeMap),
       'account' => $accounts,
     );
 
     // Test that the accounts have access to the correspoding page revision permissions.
-    $revision = $this->node_revisions['page'][1];
+    $revision = $this->nodeRevisions['page'][1];
 
     $permutations = $this->generatePermutations($parameters);
     $node_revision_access = \Drupal::service('access_check.node.revision');
     foreach ($permutations as $case) {
       // Skip this test if there are no revisions for the node.
       if (!($revision->isDefaultRevision() && (db_query('SELECT COUNT(vid) FROM {node_field_revision} WHERE nid = :nid', array(':nid' => $revision->id()))->fetchField() == 1 || $case['op'] == 'update' || $case['op'] == 'delete'))) {
-        if (!empty($case['account']->is_admin) || $case['account']->hasPermission($this->type_map[$case['op']], $case['account'])) {
-          $this->assertTrue($node_revision_access->checkAccess($revision, $case['account'], $case['op']), "{$this->type_map[$case['op']]} granted.");
+        if (!empty($case['account']->is_admin) || $case['account']->hasPermission($this->typeMap[$case['op']], $case['account'])) {
+          $this->assertTrue($node_revision_access->checkAccess($revision, $case['account'], $case['op']), "{$this->typeMap[$case['op']]} granted.");
         }
         else {
-          $this->assertFalse($node_revision_access->checkAccess($revision, $case['account'], $case['op']), "{$this->type_map[$case['op']]} not granted.");
+          $this->assertFalse($node_revision_access->checkAccess($revision, $case['account'], $case['op']), "{$this->typeMap[$case['op']]} not granted.");
         }
       }
     }
 
     // Test that the accounts have no access to the article revisions.
-    $revision = $this->node_revisions['article'][1];
+    $revision = $this->nodeRevisions['article'][1];
 
     foreach ($permutations as $case) {
-      $this->assertFalse($node_revision_access->checkAccess($revision, $case['account'], $case['op']), "{$this->type_map[$case['op']]} did not grant revision permission for articles.");
+      $this->assertFalse($node_revision_access->checkAccess($revision, $case['account'], $case['op']), "{$this->typeMap[$case['op']]} did not grant revision permission for articles.");
     }
   }
 }
diff --git a/core/modules/node/src/Tests/NodeSaveTest.php b/core/modules/node/src/Tests/NodeSaveTest.php
index 2720bff..068eaae 100644
--- a/core/modules/node/src/Tests/NodeSaveTest.php
+++ b/core/modules/node/src/Tests/NodeSaveTest.php
@@ -17,6 +17,13 @@
 class NodeSaveTest extends NodeTestBase {
 
   /**
+   * A normal logged in user.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $webUser;
+
+  /**
    * Modules to enable.
    *
    * @var array
@@ -29,7 +36,7 @@ protected function setUp() {
     // Create a user that is allowed to post; we'll use this to test the submission.
     $web_user = $this->drupalCreateUser(array('create article content'));
     $this->drupalLogin($web_user);
-    $this->web_user = $web_user;
+    $this->webUser = $web_user;
   }
 
   /**
@@ -48,7 +55,7 @@ function testImport() {
     $node = array(
       'title' => $title,
       'body' => array(array('value' => $this->randomMachineName(32))),
-      'uid' => $this->web_user->id(),
+      'uid' => $this->webUser->id(),
       'type' => 'article',
       'nid' => $test_nid,
     );
@@ -57,7 +64,7 @@ function testImport() {
     $node->enforceIsNew();
 
     // Verify that node_submit did not overwrite the user ID.
-    $this->assertEqual($node->getOwnerId(), $this->web_user->id(), 'Function node_submit() preserves user ID');
+    $this->assertEqual($node->getOwnerId(), $this->webUser->id(), 'Function node_submit() preserves user ID');
 
     $node->save();
     // Test the import.
@@ -74,7 +81,7 @@ function testImport() {
   function testTimestamps() {
     // Use the default timestamps.
     $edit = array(
-      'uid' => $this->web_user->id(),
+      'uid' => $this->webUser->id(),
       'type' => 'article',
       'title' => $this->randomMachineName(8),
     );
@@ -101,7 +108,7 @@ function testTimestamps() {
 
     // Programmatically set the timestamps on the node.
     $edit = array(
-      'uid' => $this->web_user->id(),
+      'uid' => $this->webUser->id(),
       'type' => 'article',
       'title' => $this->randomMachineName(8),
       'created' => 280299600, // Sun, 19 Nov 1978 05:00:00 GMT
@@ -132,7 +139,7 @@ function testTimestamps() {
   function testDeterminingChanges() {
     // Initial creation.
     $node = entity_create('node', array(
-      'uid' => $this->web_user->id(),
+      'uid' => $this->webUser->id(),
       'type' => 'article',
       'title' => 'test_changes',
     ));
diff --git a/core/modules/node/src/Tests/NodeTitleTest.php b/core/modules/node/src/Tests/NodeTitleTest.php
index d692be5..25e2576 100644
--- a/core/modules/node/src/Tests/NodeTitleTest.php
+++ b/core/modules/node/src/Tests/NodeTitleTest.php
@@ -21,13 +21,18 @@ class NodeTitleTest extends NodeTestBase {
    */
   public static $modules = array('comment', 'views');
 
-  protected $admin_user;
+  /**
+   * A user with permission to bypass access content.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
 
   protected function setUp() {
     parent::setUp();
 
-    $this->admin_user = $this->drupalCreateUser(array('administer nodes', 'create article content', 'create page content', 'post comments'));
-    $this->drupalLogin($this->admin_user);
+    $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');
   }
 
diff --git a/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php b/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php
index 63b1ce6..ba69214 100644
--- a/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php
+++ b/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php
@@ -27,12 +27,19 @@ class NodeTypeRenameConfigImportTest extends WebTestBase {
   public static $modules = array('node', 'text', 'config');
 
   /**
+   * A normal logged in user.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $webUser;
+
+  /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $this->web_user = $this->drupalCreateUser(array('synchronize configuration'));
-    $this->drupalLogin($this->web_user);
+    $this->webUser = $this->drupalCreateUser(array('synchronize configuration'));
+    $this->drupalLogin($this->webUser);
   }
 
   /**
diff --git a/core/modules/node/src/Tests/PageEditTest.php b/core/modules/node/src/Tests/PageEditTest.php
index 1623a5f..41aad7b 100644
--- a/core/modules/node/src/Tests/PageEditTest.php
+++ b/core/modules/node/src/Tests/PageEditTest.php
@@ -13,21 +13,32 @@
  * @group node
  */
 class PageEditTest extends NodeTestBase {
-  protected $web_user;
-  protected $admin_user;
+  /**
+   * A user with 'edit own page content' and 'create page content' permissions.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $webUser;
+
+  /**
+   * A user with permission to bypass node access and administer nodes.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
 
   protected function setUp() {
     parent::setUp();
 
-    $this->web_user = $this->drupalCreateUser(array('edit own page content', 'create page content'));
-    $this->admin_user = $this->drupalCreateUser(array('bypass node access', 'administer nodes'));
+    $this->webUser = $this->drupalCreateUser(array('edit own page content', 'create page content'));
+    $this->adminUser = $this->drupalCreateUser(array('bypass node access', 'administer nodes'));
   }
 
   /**
    * Checks node edit functionality.
    */
   function testPageEdit() {
-    $this->drupalLogin($this->web_user);
+    $this->drupalLogin($this->webUser);
 
     $title_key = 'title[0][value]';
     $body_key = 'body[0][value]';
@@ -92,7 +103,7 @@ function testPageEdit() {
    */
   function testPageAuthoredBy() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
-    $this->drupalLogin($this->admin_user);
+    $this->drupalLogin($this->adminUser);
 
     // Create node to edit.
     $body_key = 'body[0][value]';
@@ -103,7 +114,7 @@ function testPageAuthoredBy() {
 
     // Check that the node was authored by the currently logged in user.
     $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
-    $this->assertIdentical($node->getOwnerId(), $this->admin_user->id(), 'Node authored by admin user.');
+    $this->assertIdentical($node->getOwnerId(), $this->adminUser->id(), 'Node authored by admin user.');
 
     // Try to change the 'authored by' field to an invalid user name.
     $edit = array(
@@ -121,14 +132,14 @@ function testPageAuthoredBy() {
 
     // Change the authored by field to another user's name (that is not
     // logged in).
-    $edit['uid[0][target_id]'] = $this->web_user->getUsername();
+    $edit['uid[0][target_id]'] = $this->webUser->getUsername();
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
     $node_storage->resetCache(array($node->id()));
     $node = $node_storage->load($node->id());
-    $this->assertIdentical($node->getOwnerId(), $this->web_user->id(), 'Node authored by normal user.');
+    $this->assertIdentical($node->getOwnerId(), $this->webUser->id(), 'Node authored by normal user.');
 
     // Check that normal users cannot change the authored by information.
-    $this->drupalLogin($this->web_user);
+    $this->drupalLogin($this->webUser);
     $this->drupalGet('node/' . $node->id() . '/edit');
     $this->assertNoFieldByName('uid[0][target_id]');
   }
diff --git a/core/modules/node/src/Tests/PagePreviewTest.php b/core/modules/node/src/Tests/PagePreviewTest.php
index 4c40ae9..ce3e607 100644
--- a/core/modules/node/src/Tests/PagePreviewTest.php
+++ b/core/modules/node/src/Tests/PagePreviewTest.php
@@ -30,7 +30,7 @@ class PagePreviewTest extends NodeTestBase {
    *
    * @var string
    */
-  protected $field_name;
+  protected $fieldName;
 
   protected function setUp() {
     parent::setUp();
@@ -62,9 +62,9 @@ protected function setUp() {
     $this->term = $term;
 
     // Create a field.
-    $this->field_name = Unicode::strtolower($this->randomMachineName());
+    $this->fieldName = Unicode::strtolower($this->randomMachineName());
     entity_create('field_storage_config', array(
-      'field_name' => $this->field_name,
+      'field_name' => $this->fieldName,
       'entity_type' => 'node',
       'type' => 'taxonomy_term_reference',
       'settings' => array(
@@ -78,25 +78,25 @@ protected function setUp() {
       'cardinality' => '-1',
     ))->save();
     entity_create('field_config', array(
-      'field_name' => $this->field_name,
+      'field_name' => $this->fieldName,
       'entity_type' => 'node',
       'bundle' => 'page',
     ))->save();
 
     entity_get_form_display('node', 'page', 'default')
-      ->setComponent($this->field_name, array(
+      ->setComponent($this->fieldName, array(
         'type' => 'taxonomy_autocomplete',
       ))
       ->save();
 
     // Show on default display and teaser.
     entity_get_display('node', 'page', 'default')
-      ->setComponent($this->field_name, array(
+      ->setComponent($this->fieldName, array(
         'type' => 'taxonomy_term_reference_link',
       ))
       ->save();
     entity_get_display('node', 'page', 'teaser')
-      ->setComponent($this->field_name, array(
+      ->setComponent($this->fieldName, array(
         'type' => 'taxonomy_term_reference_link',
       ))
       ->save();
@@ -108,7 +108,7 @@ protected function setUp() {
   function testPagePreview() {
     $title_key = 'title[0][value]';
     $body_key = 'body[0][value]';
-    $term_key = $this->field_name;
+    $term_key = $this->fieldName;
 
     // Fill in node creation form and preview node.
     $edit = array();
@@ -212,7 +212,7 @@ function testPagePreview() {
   function testPagePreviewWithRevisions() {
     $title_key = 'title[0][value]';
     $body_key = 'body[0][value]';
-    $term_key = $this->field_name;
+    $term_key = $this->fieldName;
     // Force revision on "Basic page" content.
     $node_type = NodeType::load('page');
     $node_type->setNewRevision(TRUE);
diff --git a/core/modules/node/src/Tests/Views/NodeFieldFilterTest.php b/core/modules/node/src/Tests/Views/NodeFieldFilterTest.php
index 599b126..2fa9bec 100644
--- a/core/modules/node/src/Tests/Views/NodeFieldFilterTest.php
+++ b/core/modules/node/src/Tests/Views/NodeFieldFilterTest.php
@@ -34,7 +34,7 @@ class NodeFieldFilterTest extends NodeTestBase {
    *
    * @var array
    */
-  public $node_titles = array();
+  public $nodeTitles = array();
 
   function setUp() {
     parent::setUp();
@@ -55,17 +55,17 @@ function setUp() {
     $field_storage->save();
 
     // Set up node titles.
-    $this->node_titles = array(
+    $this->nodeTitles = array(
       'en' => 'Food in Paris',
       'es' => 'Comida en Paris',
       'fr' => 'Nouriture en Paris',
     );
 
     // Create node with translations.
-    $node = $this->drupalCreateNode(array('title' => $this->node_titles['en'], 'langcode' => 'en', 'type' => 'page', 'body' => array(array('value' => $this->node_titles['en']))));
+    $node = $this->drupalCreateNode(array('title' => $this->nodeTitles['en'], 'langcode' => 'en', 'type' => 'page', 'body' => array(array('value' => $this->nodeTitles['en']))));
     foreach (array('es', 'fr') as $langcode) {
-      $translation = $node->addTranslation($langcode, array('title' => $this->node_titles[$langcode]));
-      $translation->body->value = $this->node_titles[$langcode];
+      $translation = $node->addTranslation($langcode, array('title' => $this->nodeTitles[$langcode]));
+      $translation->body->value = $this->nodeTitles[$langcode];
     }
     $node->save();
   }
@@ -114,7 +114,7 @@ protected function assertPageCounts($path, $counts, $message) {
     // page, and they are the same. So the title/body string should appear on
     // the page twice as many times as the input count.
     foreach ($counts as $langcode => $count) {
-      $this->assertEqual(substr_count($text, $this->node_titles[$langcode]), 2 * $count, 'Translation ' . $langcode . ' has count ' . $count . ' with ' . $message);
+      $this->assertEqual(substr_count($text, $this->nodeTitles[$langcode]), 2 * $count, 'Translation ' . $langcode . ' has count ' . $count . ' with ' . $message);
     }
   }
 }
diff --git a/core/modules/node/src/Tests/Views/NodeLanguageTest.php b/core/modules/node/src/Tests/Views/NodeLanguageTest.php
index 0195b44..2da6294 100644
--- a/core/modules/node/src/Tests/Views/NodeLanguageTest.php
+++ b/core/modules/node/src/Tests/Views/NodeLanguageTest.php
@@ -36,7 +36,7 @@ class NodeLanguageTest extends NodeTestBase {
    *
    * @var array
    */
-  public $node_titles = array();
+  public $nodeTitles = array();
 
   /**
    * {@inheritdoc}
@@ -63,7 +63,7 @@ protected function setUp() {
     // Set up node titles. They should not include the words "French",
     // "English", or "Spanish", as there is a language field in the view
     // that prints out those words.
-    $this->node_titles = array(
+    $this->nodeTitles = array(
       'es' => array(
         'Primero nodo es',
         'Segundo nodo es',
@@ -79,11 +79,11 @@ protected function setUp() {
     );
 
     // Create nodes with translations.
-    foreach ($this->node_titles['es'] as $index => $title) {
+    foreach ($this->nodeTitles['es'] as $index => $title) {
       $node = $this->drupalCreateNode(array('title' => $title, 'langcode' => 'es', 'type' => 'page', 'promote' => 1));
       foreach (array('en', 'fr') as $langcode) {
-        if (isset($this->node_titles[$langcode][$index])) {
-          $translation = $node->addTranslation($langcode, array('title' => $this->node_titles[$langcode][$index]));
+        if (isset($this->nodeTitles[$langcode][$index])) {
+          $translation = $node->addTranslation($langcode, array('title' => $this->nodeTitles[$langcode][$index]));
           $translation->body->value = $this->randomMachineName(32);
         }
       }
@@ -104,7 +104,7 @@ public function testLanguages() {
     $message = 'French/Spanish page';
 
     // Test that the correct nodes are shown.
-    foreach ($this->node_titles as $langcode => $list) {
+    foreach ($this->nodeTitles as $langcode => $list) {
       foreach ($list as $title) {
         if ($langcode == 'en') {
           $this->assertNoText($title, $title . ' does not appear on ' . $message);
@@ -125,10 +125,10 @@ public function testLanguages() {
     $page = $this->getTextContent();
     $pos_es_max = 0;
     $pos_fr_min = 10000;
-    foreach ($this->node_titles['es'] as $title) {
+    foreach ($this->nodeTitles['es'] as $title) {
       $pos_es_max = max($pos_es_max, strpos($page, $title));
     }
-    foreach ($this->node_titles['fr'] as $title) {
+    foreach ($this->nodeTitles['fr'] as $title) {
       $pos_fr_min = min($pos_fr_min, strpos($page, $title));
     }
     $this->assertTrue($pos_es_max < $pos_fr_min, 'Spanish translations appear before French on ' . $message);
@@ -143,12 +143,12 @@ public function testLanguages() {
 
     // Test the front page view filter. Only node titles in the current language
     // should be displayed on the front page by default.
-    foreach ($this->node_titles as $langcode => $titles) {
+    foreach ($this->nodeTitles as $langcode => $titles) {
       $this->drupalGet(($langcode == 'en' ? '' : "$langcode/") . 'node');
       foreach ($titles as $title) {
         $this->assertText($title);
       }
-      foreach ($this->node_titles as $control_langcode => $control_titles) {
+      foreach ($this->nodeTitles as $control_langcode => $control_titles) {
         if ($langcode != $control_langcode) {
           foreach ($control_titles as $title) {
             $this->assertNoText($title);
@@ -159,18 +159,18 @@ public function testLanguages() {
 
     // Test the node admin view filter. By default all translations should show.
     $this->drupalGet('admin/content');
-    foreach ($this->node_titles as $titles) {
+    foreach ($this->nodeTitles as $titles) {
       foreach ($titles as $title) {
         $this->assertText($title);
       }
     }
     // When filtered, only the specific languages should show.
-    foreach ($this->node_titles as $langcode => $titles) {
+    foreach ($this->nodeTitles as $langcode => $titles) {
       $this->drupalGet('admin/content', array('query' => array('langcode' => $langcode)));
       foreach ($titles as $title) {
         $this->assertText($title);
       }
-      foreach ($this->node_titles as $control_langcode => $control_titles) {
+      foreach ($this->nodeTitles as $control_langcode => $control_titles) {
         if ($langcode != $control_langcode) {
           foreach ($control_titles as $title) {
             $this->assertNoText($title);
@@ -185,9 +185,9 @@ public function testLanguages() {
     $config = $this->config('views.view.frontpage');
     $config->set('display.default.display_options.filters.langcode.value', array(PluginBase::VIEWS_QUERY_LANGUAGE_SITE_DEFAULT => PluginBase::VIEWS_QUERY_LANGUAGE_SITE_DEFAULT));
     $config->save();
-    foreach ($this->node_titles as $langcode => $titles) {
+    foreach ($this->nodeTitles as $langcode => $titles) {
       $this->drupalGet(($langcode == 'en' ? '' : "$langcode/") . 'node');
-      foreach ($this->node_titles as $control_langcode => $control_titles) {
+      foreach ($this->nodeTitles as $control_langcode => $control_titles) {
         foreach ($control_titles as $title) {
           if ($control_langcode == 'en') {
             $this->assertText($title, 'English title is shown when filtering is site default');
@@ -215,7 +215,7 @@ public function testLanguages() {
 
     // With a fixed language selected, there is no language-based URL.
     $this->drupalGet('node');
-    foreach ($this->node_titles as $control_langcode => $control_titles) {
+    foreach ($this->nodeTitles as $control_langcode => $control_titles) {
       foreach ($control_titles as $title) {
         if ($control_langcode == 'es') {
           $this->assertText($title, 'Spanish title is shown when filtering is fixed UI language');