diff -u b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml
--- b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml
+++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml
@@ -94,8 +94,8 @@
           hide_empty: '0'
           empty_zero: '0'
           hide_alter_empty: '1'
-          module: views_test_config
-          name: test_value_name
+          data_module: views_test_config
+          data_name: test_value_name
           plugin_id: user_data
       filters:
         uid:
diff -u b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
--- b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
@@ -763,25 +763,26 @@
     // choose the first field with a field handler.
     $data = Views::viewsData()->get($this->base_table);
     if (isset($data['table']['base']['defaults']['field'])) {
-      $field = $data['table']['base']['defaults']['field'];
+      $default_field = $data['table']['base']['defaults']['field'];
     }
     else {
-      foreach ($data as $field => $field_data) {
+      foreach ($data as $default_field => $field_data) {
         if (isset($field_data['field']['id'])) {
           break;
         }
       }
     }
-    $display_options['fields'][$field] = array(
+    $display_options['fields'][$default_field] = array(
       'table' => $this->base_table,
-      'field' => $field,
-      'id' => $field,
+      'field' => $default_field,
+      'id' => $default_field,
     );
 
     // Load the plugin ID and module.
-    $display_options['fields'][$field]['plugin_id'] = $data[$field]['field']['id'];
-    if ($definition = Views::pluginManager('field')->getDefinition($display_options['fields'][$field]['plugin_id'])) {
-      $display_options['fields'][$field]['provider'] = isset($definition['module']) ? $definition['provider'] : 'views';
+    $base_field = $data['table']['base']['field'];
+    $display_options['fields'][$base_field]['plugin_id'] = $data[$base_field]['field']['id'];
+    if ($definition = Views::pluginManager('field')->getDefinition($display_options['fields'][$base_field]['plugin_id'])) {
+      $display_options['fields'][$base_field]['provider'] = isset($definition['module']) ? $definition['provider'] : 'views';
     }
 
     return $display_options;
diff -u b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
--- b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
@@ -286,6 +286,7 @@
       'table' => 'views_test_data',
       'field' => 'id',
       'plugin_id' => 'numeric',
+      'provider' => 'views',
     );
     $this->assertEqual($item1, $expected_item);
 
@@ -294,7 +295,6 @@
       'table' => 'views_test_data',
       'field' => 'id',
       'plugin_id' => 'numeric',
-      'provider' => 'views',
     );
     $this->assertEqual($item1, $expected_item);
 
@@ -302,6 +302,7 @@
       'table' => 'views_test_data',
       'field' => 'name',
       'plugin_id' => 'standard',
+      'provider' => 'views',
     ) + $options;
     $this->assertEqual($item2, $expected_item);
 
@@ -310,7 +311,6 @@
       'table' => 'views_test_data',
       'field' => 'name',
       'plugin_id' => 'standard',
-      'provider' => 'views',
     ) + $options;
     $this->assertEqual($item2, $expected_item);