diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Category.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Category.php
index 9df7f10..3424ca7 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Category.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Category.php
@@ -28,7 +28,7 @@ class Category extends FieldPluginBase {
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     parent::init($view, $display, $options);
 
-    $this->additional_fields['cid'] = 'cid';
+    $this->additionalFields['cid'] = 'cid';
   }
 
   /**
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php
index dbcf781..0eaba40 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php
@@ -29,7 +29,7 @@ class TitleLink extends FieldPluginBase {
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     parent::init($view, $display, $options);
 
-    $this->additional_fields['link'] = 'link';
+    $this->additionalFields['link'] = 'link';
   }
 
   /**
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php
index 45e47c4..916fe0f 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php
@@ -31,8 +31,8 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
     parent::init($view, $display, $options);
 
     if (!empty($this->options['link_to_comment'])) {
-      $this->additional_fields['cid'] = 'cid';
-      $this->additional_fields['nid'] = 'nid';
+      $this->additionalFields['cid'] = 'cid';
+      $this->additionalFields['nid'] = 'nid';
     }
   }
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php
index ee2772b..a2d9445 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php
@@ -27,7 +27,7 @@ class LastTimestamp extends Date {
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     parent::init($view, $display, $options);
 
-    $this->additional_fields['comment_count'] = 'comment_count';
+    $this->additionalFields['comment_count'] = 'comment_count';
   }
 
   public function render($values) {
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php
index 6be3577..49b40c1 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php
@@ -42,7 +42,7 @@ public function query() {
     // ncs_user alias so this can work with the sort handler, below.
     $this->user_table = $this->query->ensureTable('ncs_users', $this->relationship, $join);
 
-    $this->field_alias = $this->query->addField(NULL, "COALESCE($this->user_table.name, $this->tableAlias.$this->field)", $this->tableAlias . '_' . $this->field);
+    $this->fieldAlias = $this->query->addField(NULL, "COALESCE($this->user_table.name, $this->tableAlias.$this->field)", $this->tableAlias . '_' . $this->field);
 
     $this->user_field = $this->query->addField($this->user_table, 'name');
     $this->uid = $this->query->addField($this->tableAlias, 'last_comment_uid');
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php
index f6209f2..3828cd2 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php
@@ -22,7 +22,7 @@ class NcsLastUpdated extends Date {
   public function query() {
     $this->ensureMyTable();
     $this->node_table = $this->query->ensureTable('node', $this->relationship);
-    $this->field_alias = $this->query->addField(NULL, "GREATEST(" . $this->node_table . ".changed, " . $this->tableAlias . ".last_comment_timestamp)", $this->tableAlias . '_' . $this->field);
+    $this->fieldAlias = $this->query->addField(NULL, "GREATEST(" . $this->node_table . ".changed, " . $this->tableAlias . ".last_comment_timestamp)", $this->tableAlias . '_' . $this->field);
   }
 
 }
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
index 9041a55..966ae10 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
@@ -62,9 +62,9 @@ public static function create(ContainerInterface $container, array $configuratio
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     parent::init($view, $display, $options);
 
-    $this->additional_fields['nid'] = 'nid';
-    $this->additional_fields['type'] = 'type';
-    $this->additional_fields['comment_count'] = array('table' => 'node_comment_statistics', 'field' => 'comment_count');
+    $this->additionalFields['nid'] = 'nid';
+    $this->additionalFields['type'] = 'type';
+    $this->additionalFields['comment_count'] = array('table' => 'node_comment_statistics', 'field' => 'comment_count');
   }
 
   protected function defineOptions() {
@@ -89,7 +89,7 @@ public function buildOptionsForm(&$form, &$form_state) {
   public function query() {
     $this->ensureMyTable();
     $this->addAdditionalFields();
-    $this->field_alias = $this->table . '_' . $this->field;
+    $this->fieldAlias = $this->table . '_' . $this->field;
   }
 
   public function preRender(&$values) {
@@ -102,7 +102,7 @@ public function preRender(&$values) {
     $ids = array();
     foreach ($values as $id => $result) {
       $nids[] = $result->{$this->aliases['nid']};
-      $values[$id]->{$this->field_alias} = 0;
+      $values[$id]->{$this->fieldAlias} = 0;
       // Create a reference so we can find this record in the values again.
       if (empty($ids[$result->{$this->aliases['nid']}])) {
         $ids[$result->{$this->aliases['nid']}] = array();
@@ -122,7 +122,7 @@ public function preRender(&$values) {
 
       foreach ($result as $node) {
         foreach ($ids[$node->id()] as $id) {
-          $values[$id]->{$this->field_alias} = $node->num_comments;
+          $values[$id]->{$this->fieldAlias} = $node->num_comments;
         }
       }
     }
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php
index 4bad129..ba1c250 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php
@@ -30,8 +30,8 @@ class Username extends FieldPluginBase {
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     parent::init($view, $display, $options);
 
-    $this->additional_fields['uid'] = 'uid';
-    $this->additional_fields['homepage'] = 'homepage';
+    $this->additionalFields['uid'] = 'uid';
+    $this->additionalFields['homepage'] = 'homepage';
   }
 
   protected function defineOptions() {
diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php
index 7ce432b..906c8f2 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php
@@ -185,7 +185,7 @@ public function query($use_groupby = FALSE) {
     $this->get_base_table();
 
     $entity_type = $this->definition['entity_tables'][$this->base_table];
-    $fields = $this->additional_fields;
+    $fields = $this->additionalFields;
     // No need to add the entity type.
     $entity_type_key = array_search('entity_type', $fields);
     if ($entity_type_key !== FALSE) {
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php
index c1d2493..446bc3d 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php
@@ -29,7 +29,7 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
     parent::init($view, $display, $options);
 
     if (!empty($options['link_to_file'])) {
-      $this->additional_fields['uri'] = 'uri';
+      $this->additionalFields['uri'] = 'uri';
     }
   }
 
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php
index 8fa60d5..704a2ac 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php
@@ -34,7 +34,7 @@ public function buildOptionsForm(&$form, &$form_state) {
   }
 
   public function render($values) {
-    $data = $values->{$this->field_alias};
+    $data = $values->{$this->fieldAlias};
     if (!empty($this->options['filemime_image']) && $data !== NULL && $data !== '') {
       $file_icon = array(
         '#theme' => 'file_icon',
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php
index b568b0d..f435456 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php
@@ -33,7 +33,7 @@ public function buildOptionsForm(&$form, &$form_state) {
   }
 
   public function render($values) {
-    $data = $values->{$this->field_alias};
+    $data = $values->{$this->fieldAlias};
     if (!empty($this->options['file_download_path']) && $data !== NULL && $data !== '') {
       $data = file_create_url($data);
     }
diff --git a/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php b/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php
index ab81c8e..a649b7b 100644
--- a/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php
+++ b/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php
@@ -32,10 +32,10 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
 
     global $user;
     if ($user->isAuthenticated()) {
-      $this->additional_fields['created'] = array('table' => 'node_field_data', 'field' => 'created');
-      $this->additional_fields['changed'] = array('table' => 'node_field_data', 'field' => 'changed');
+      $this->additionalFields['created'] = array('table' => 'node_field_data', 'field' => 'created');
+      $this->additionalFields['changed'] = array('table' => 'node_field_data', 'field' => 'changed');
       if (module_exists('comment') && !empty($this->options['comments'])) {
-        $this->additional_fields['last_comment'] = array('table' => 'node_comment_statistics', 'field' => 'last_comment_timestamp');
+        $this->additionalFields['last_comment'] = array('table' => 'node_comment_statistics', 'field' => 'last_comment_timestamp');
       }
     }
   }
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php
index 9419999..e2b4ea8 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php
@@ -32,9 +32,9 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
 
     // Don't add the additional fields to groupby
     if (!empty($this->options['link_to_node'])) {
-      $this->additional_fields['nid'] = array('table' => 'node', 'field' => 'nid');
+      $this->additionalFields['nid'] = array('table' => 'node', 'field' => 'nid');
       if (module_exists('translation')) {
-        $this->additional_fields['langcode'] = array('table' => 'node', 'field' => 'langcode');
+        $this->additionalFields['langcode'] = array('table' => 'node', 'field' => 'langcode');
       }
     }
   }
@@ -65,7 +65,7 @@ public function buildOptionsForm(&$form, &$form_state) {
    * Data should be made XSS safe prior to calling this function.
    */
   function render_link($data, ResultRow $values) {
-    if (!empty($this->options['link_to_node']) && !empty($this->additional_fields['nid'])) {
+    if (!empty($this->options['link_to_node']) && !empty($this->additionalFields['nid'])) {
       if ($data !== NULL && $data !== '') {
         $this->options['alter']['make_link'] = TRUE;
         $this->options['alter']['path'] = "node/" . $this->getValue($values, 'nid');
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php
index 78ff114..c68a375 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php
@@ -27,7 +27,7 @@ class Path extends FieldPluginBase {
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     parent::init($view, $display, $options);
 
-    $this->additional_fields['nid'] = 'nid';
+    $this->additionalFields['nid'] = 'nid';
   }
 
   protected function defineOptions() {
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php
index d1a574a..5d998f6 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php
@@ -29,10 +29,10 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
     parent::init($view, $display, $options);
 
     if (!empty($this->options['link_to_node_revision'])) {
-      $this->additional_fields['vid'] = 'vid';
-      $this->additional_fields['nid'] = 'nid';
+      $this->additionalFields['vid'] = 'vid';
+      $this->additionalFields['nid'] = 'nid';
       if (module_exists('translation')) {
-        $this->additional_fields['langcode'] = array('table' => 'node', 'field' => 'langcode');
+        $this->additionalFields['langcode'] = array('table' => 'node', 'field' => 'langcode');
       }
     }
   }
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php
index 8076861..c90de92 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php
@@ -28,7 +28,7 @@ class RevisionLink extends Link {
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     parent::init($view, $display, $options);
 
-    $this->additional_fields['node_vid'] = array('table' => 'node_field_revision', 'field' => 'vid');
+    $this->additionalFields['node_vid'] = array('table' => 'node_field_revision', 'field' => 'vid');
   }
 
   public function access() {
diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php b/core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php
index 9293694..a4fed60 100644
--- a/core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php
+++ b/core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php
@@ -63,7 +63,7 @@ public function query() {
     // one or obviously this won't work.
     foreach ($this->view->filter as $handler) {
       if (isset($handler->search_score) && $handler->relationship == $this->relationship) {
-        $this->field_alias = $handler->search_score;
+        $this->fieldAlias = $handler->search_score;
         $this->tableAlias = $handler->tableAlias;
         return;
       }
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php
index 00d6c71..a15aa65 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php
@@ -27,8 +27,8 @@ class LinkEdit extends FieldPluginBase {
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     parent::init($view, $display, $options);
 
-    $this->additional_fields['tid'] = 'tid';
-    $this->additional_fields['vid'] = 'vid';
+    $this->additionalFields['tid'] = 'tid';
+    $this->additionalFields['vid'] = 'vid';
   }
 
   protected function defineOptions() {
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php
index bcf2127..b0e4c2b 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php
@@ -34,8 +34,8 @@ class Taxonomy extends FieldPluginBase {
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     parent::init($view, $display, $options);
 
-    $this->additional_fields['vid'] = 'vid';
-    $this->additional_fields['tid'] = 'tid';
+    $this->additionalFields['vid'] = 'vid';
+    $this->additionalFields['tid'] = 'tid';
   }
 
   protected function defineOptions() {
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php
index 8cbb9fb..51f5502 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php
@@ -29,10 +29,10 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
 
     // @todo: Wouldn't it be possible to use $this->base_table and no if here?
     if ($view->storage->get('base_table') == 'node_field_revision') {
-      $this->additional_fields['nid'] = array('table' => 'node_field_revision', 'field' => 'nid');
+      $this->additionalFields['nid'] = array('table' => 'node_field_revision', 'field' => 'nid');
     }
     else {
-      $this->additional_fields['nid'] = array('table' => 'node', 'field' => 'nid');
+      $this->additionalFields['nid'] = array('table' => 'node', 'field' => 'nid');
     }
   }
 
@@ -93,7 +93,7 @@ public function query() {
 
   public function preRender(&$values) {
     $vocabularies = entity_load_multiple('taxonomy_vocabulary');
-    $this->field_alias = $this->aliases['nid'];
+    $this->fieldAlias = $this->aliases['nid'];
     $nids = array();
     foreach ($values as $result) {
       if (!empty($result->{$this->aliases['nid']})) {
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php
index 1a0d89e..6702057 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php
@@ -29,7 +29,7 @@ class Link extends FieldPluginBase {
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     parent::init($view, $display, $options);
 
-    $this->additional_fields['uid'] = 'uid';
+    $this->additionalFields['uid'] = 'uid';
   }
 
   protected function defineOptions() {
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php
index f754edc..9dca752 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php
@@ -31,7 +31,7 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
     parent::init($view, $display, $options);
 
     if (!empty($this->options['overwrite_anonymous']) || !empty($this->options['format_username'])) {
-      $this->additional_fields['uid'] = 'uid';
+      $this->additionalFields['uid'] = 'uid';
     }
   }
 
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php
index d4f0c79..ae09978 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php
@@ -72,12 +72,12 @@ public static function create(ContainerInterface $container, array $configuratio
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     parent::init($view, $display, $options);
 
-    $this->additional_fields['uid'] = array('table' => 'users', 'field' => 'uid');
+    $this->additionalFields['uid'] = array('table' => 'users', 'field' => 'uid');
   }
 
   public function query() {
     $this->addAdditionalFields();
-    $this->field_alias = $this->aliases['uid'];
+    $this->fieldAlias = $this->aliases['uid'];
   }
 
   public function preRender(&$values) {
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php
index 22c2819..371b4e3 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php
@@ -61,12 +61,12 @@ public static function create(ContainerInterface $container, array $configuratio
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     parent::init($view, $display, $options);
 
-    $this->additional_fields['uid'] = array('table' => 'users', 'field' => 'uid');
+    $this->additionalFields['uid'] = array('table' => 'users', 'field' => 'uid');
   }
 
   public function query() {
     $this->addAdditionalFields();
-    $this->field_alias = $this->aliases['uid'];
+    $this->fieldAlias = $this->aliases['uid'];
   }
 
   public function preRender(&$values) {
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php
index 60fdf91..3e43565 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php
@@ -29,7 +29,7 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
     parent::init($view, $display, $options);
 
     if (!empty($this->options['link_to_user'])) {
-      $this->additional_fields['uid'] = 'uid';
+      $this->additionalFields['uid'] = 'uid';
     }
   }
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php
index 7ecf18e..42f34ca 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php
@@ -70,7 +70,7 @@ public static function create(ContainerInterface $container, array $configuratio
    */
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     parent::init($view, $display, $options);
-    $this->additional_fields[$this->definition['entity type field']] = $this->definition['entity type field'];
+    $this->additionalFields[$this->definition['entity type field']] = $this->definition['entity type field'];
   }
 
   /**
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
index 8fdfbdc..3306ec8 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
@@ -79,7 +79,7 @@
    *
    * @var array
    */
-   $additionalFields = array();
+  protected $additionalFields = array();
 
   /**
    * Overrides Drupal\views\Plugin\views\HandlerBase::init().
@@ -132,7 +132,7 @@ public function query() {
   protected function addAdditionalFields($fields = NULL) {
     if (!isset($fields)) {
       // notice check
-      if (empty($this->aditionalields)) {
+      if (empty($this->additionalFields)) {
         return;
       }
       $fields = $this->additionalFields;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php
index f90b1a9..db2a9ea 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php
@@ -67,7 +67,7 @@ public function preRender(&$values) {
   }
 
   public function render($values) {
-    $value = $values->{$this->field_alias};
+    $value = $values->{$this->fieldAlias};
     if (!empty($this->options['machine_name']) || !isset($this->value_options[$value])) {
       $result = check_plain($value);
     }
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php
index 24c98c1..cb4dce9 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php
@@ -34,9 +34,9 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
 
     $this->format = $this->definition['format'];
 
-    $this->additional_fields = array();
+    $this->additionalFields = array();
     if (is_array($this->format)) {
-      $this->additional_fields['format'] = $this->format;
+      $this->additionalFields['format'] = $this->format;
     }
   }
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Serialized.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Serialized.php
index 2aa8639..32ac700 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Serialized.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Serialized.php
@@ -60,7 +60,7 @@ public function validateOptionsForm(&$form, &$form_state) {
   }
 
   public function render($values) {
-    $value = $values->{$this->field_alias};
+    $value = $values->{$this->fieldAlias};
 
     if ($this->options['format'] == 'unserialized') {
       return check_plain(print_r(unserialize($value), TRUE));
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/TimeInterval.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/TimeInterval.php
index a42de6f..a4f8a8f 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/TimeInterval.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/TimeInterval.php
@@ -38,7 +38,7 @@ public function buildOptionsForm(&$form, &$form_state) {
   }
 
   public function render($values) {
-    $value = $values->{$this->field_alias};
+    $value = $values->{$this->fieldAlias};
     return format_interval($value, isset($this->options['granularity']) ? $this->options['granularity'] : 2);
   }
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/row/RowPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
index a274242..6d9b383 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
@@ -153,7 +153,7 @@ public function render($row) {
       '#view' => $this->view,
       '#options' => $this->options,
       '#row' => $row,
-      '#field_alias' => isset($this->field_alias) ? $this->field_alias : '',
+      '#fieldAlias' => isset($this->field_alias) ? $this->field_alias : '',
     );
   }
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/row/RssFields.php b/core/modules/views/lib/Drupal/views/Plugin/views/row/RssFields.php
index d051c54..907ad8d 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/row/RssFields.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/row/RssFields.php
@@ -179,7 +179,7 @@ public function render($row) {
         'view' => $this->view,
         'options' => $this->options,
         'row' => $item,
-        'field_alias' => isset($this->field_alias) ? $this->field_alias : '',
+        'fieldAlias' => isset($this->field_alias) ? $this->field_alias : '',
       ));
   }
 
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 2165f67..cbf3a08 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -100,7 +100,7 @@ function views_theme($existing, $type, $theme, $path) {
     // attaches contextual links when the primary theme argument is an array.
     'display' => array('view_array' => array(), 'view' => NULL),
     'style' => array('view' => NULL, 'options' => NULL, 'rows' => NULL, 'title' => NULL),
-    'row' => array('view' => NULL, 'options' => NULL, 'row' => NULL, 'field_alias' => NULL),
+    'row' => array('view' => NULL, 'options' => NULL, 'row' => NULL, 'fieldAlias' => NULL),
     'exposed_form' => array('view' => NULL, 'options' => NULL),
     'pager' => array(
       'view' => NULL, 'options' => NULL,
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index 8b63c8e..140aafe 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -343,8 +343,8 @@ function template_preprocess_views_view_grouping(&$variables) {
  * Display a single views field.
  *
  * Interesting bits of info:
- * $field->field_alias says what the raw value in $row will be. Reach it like
- * this: @code { $row->{$field->field_alias} @endcode
+ * $field->fieldAlias says what the raw value in $row will be. Reach it like
+ * this: @code { $row->{$field->fieldAlias} @endcode
  */
 function theme_views_view_field($variables) {
   $view = $variables['view'];