diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
index 862a847..ae5e604 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
@@ -45,15 +45,15 @@
  */
 abstract class ArgumentPluginBase extends HandlerBase {
 
-  var $validator = NULL;
-  var $argument = NULL;
-  var $value = NULL;
+    protected $validator = NULL;
+    protected $argument = NULL;
+    protected $value = NULL;
 
   /**
    * The table to use for the name, should it not be in the same table as the argument.
    * @var string
    */
-  var $name_table;
+    protected $nameTable;
 
   /**
    * The field to use for the name to use in the summary, which is
@@ -61,7 +61,7 @@
    * the argument itself is the nid, but node.title is displayed.
    * @var string
    */
-  var $name_field;
+    protected $nameField;
 
   /**
    * Overrides Drupal\views\Plugin\views\HandlerBase:init().
@@ -70,10 +70,10 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
     parent::init($view, $display, $options);
 
     if (!empty($this->definition['name field'])) {
-      $this->name_field = $this->definition['name field'];
+      $this->nameField = $this->definition['name field'];
     }
     if (!empty($this->definition['name table'])) {
-      $this->name_table = $this->definition['name table'];
+      $this->nameTable = $this->definition['name table'];
     }
   }
 
@@ -820,27 +820,27 @@ protected function summaryNameField() {
     // Add the 'name' field. For example, if this is a uid argument, the
     // name field would be 'name' (i.e, the username).
 
-    if (isset($this->name_table)) {
+    if (isset($this->nameTable)) {
       // if the alias is different then we're probably added, not ensured,
       // so look up the join and add it instead.
-      if ($this->tableAlias != $this->name_table) {
-        $j = HandlerBase::getTableJoin($this->name_table, $this->table);
+      if ($this->tableAlias != $this->nameTable) {
+        $j = HandlerBase::getTableJoin($this->nameTable, $this->table);
         if ($j) {
           $join = clone $j;
           $join->leftTable = $this->tableAlias;
-          $this->name_table_alias = $this->query->addTable($this->name_table, $this->relationship, $join);
+          $this->nameTableAlias = $this->query->addTable($this->nameTable, $this->relationship, $join);
         }
       }
       else {
-        $this->name_table_alias = $this->query->ensureTable($this->name_table, $this->relationship);
+        $this->nameTableAlias = $this->query->ensureTable($this->nameTable, $this->relationship);
       }
     }
     else {
-      $this->name_table_alias = $this->tableAlias;
+      $this->nameTableAlias = $this->tableAlias;
     }
 
-    if (isset($this->name_field)) {
-      $this->name_alias = $this->query->addField($this->name_table_alias, $this->name_field);
+    if (isset($this->nameField)) {
+      $this->name_alias = $this->query->addField($this->nameTableAlias, $this->nameField);
     }
     else {
       $this->name_alias = $this->base_alias;