diff --git a/core/modules/views/templates/views-view-fields.html.twig b/core/modules/views/templates/views-view-fields.html.twig
new file mode 100644
index 0000000..2c11479
--- /dev/null
+++ b/core/modules/views/templates/views-view-fields.html.twig
@@ -0,0 +1,35 @@
+{#
+/**
+ * @file
+ * Default simple view template to all the fields as a row.
+ *
+ * - view: The view in use.
+ * - fields: an array of field objects. Each one contains:
+ *   - field.content: The output of the field.
+ *   - field.raw: The raw data for the field, if it exists. This is NOT output safe.
+ *   - field.class: The safe class id to use.
+ *   - field.handler: The Views field handler object controlling this field. Do not use
+ *     var_export to dump this object, as it can't handle the recursion.
+ *   - field.inline: Whether or not the field should be inline.
+ *   - field.inline_html: either div or span based on the above flag.
+ *   - field.wrapper_prefix: A complete wrapper containing the inline_html to use.
+ *   - field.wrapper_suffix: The closing tag for the wrapper.
+ *   - field.separator: an optional separator that may appear before a field.
+ *   - field.label: The wrap label text to use.
+ *   - field.label_html: The full HTML of the label to use including
+ *     configured element type.
+ * - row: The raw result object from the query, with all data it fetched.
+ *
+ * @ingroup views_templates
+ */
+#}
+{% for field in fields %}
+  {% if field.separator is defined  %}
+    {{ field.separator }}
+  {% endif %}
+
+  {{ field.wrapper_prefix }}
+    {{ field.label_html }}
+    {{ field.content }}
+  {{ field.wrapper_suffix }}
+{% endfor %}
diff --git a/core/modules/views/templates/views-view-fields.tpl.php b/core/modules/views/templates/views-view-fields.tpl.php
deleted file mode 100644
index ae3a4c6..0000000
--- a/core/modules/views/templates/views-view-fields.tpl.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * @file
- * Default simple view template to all the fields as a row.
- *
- * - $view: The view in use.
- * - $fields: an array of $field objects. Each one contains:
- *   - $field->content: The output of the field.
- *   - $field->raw: The raw data for the field, if it exists. This is NOT output safe.
- *   - $field->class: The safe class id to use.
- *   - $field->handler: The Views field handler object controlling this field. Do not use
- *     var_export to dump this object, as it can't handle the recursion.
- *   - $field->inline: Whether or not the field should be inline.
- *   - $field->inline_html: either div or span based on the above flag.
- *   - $field->wrapper_prefix: A complete wrapper containing the inline_html to use.
- *   - $field->wrapper_suffix: The closing tag for the wrapper.
- *   - $field->separator: an optional separator that may appear before a field.
- *   - $field->label: The wrap label text to use.
- *   - $field->label_html: The full HTML of the label to use including
- *     configured element type.
- * - $row: The raw result object from the query, with all data it fetched.
- *
- * @ingroup views_templates
- */
-?>
-<?php foreach ($fields as $id => $field): ?>
-  <?php if (!empty($field->separator)): ?>
-    <?php print $field->separator; ?>
-  <?php endif; ?>
-
-  <?php print $field->wrapper_prefix; ?>
-    <?php print $field->label_html; ?>
-    <?php print $field->content; ?>
-  <?php print $field->wrapper_suffix; ?>
-<?php endforeach; ?>
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index 44f48f6..3774c65 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -175,24 +175,39 @@ function template_preprocess_views_view(&$vars) {
 }
 
 /**
- * Preprocess theme function to print a single record from a row, with fields
+ * Prepares variables for Views fields template.
+ *
+ * Default template: views-view-fields.html.twig
+ *
+ * @param array $variables
+ *   An associative array containing:
+ *     - view: The view object.
+ *     - options: An array of options. Each option contains:
+ *       - inline: An array that contains the fields that are to be
+ *       displayed inline.
+ *       - default_field_elements: If default field wrapper
+ *       - elements are to be provided.
+ *       - hide_empty: Whether the field is to be hidden if empty.
+ *       - element_default_classes: If the default classes are to be added.
+ *       - seperator: A string to be placed between inline fields to keep
+ *       them from squishing up next to each other.
+ *     - row: An array containg information about the current row.
  */
-function template_preprocess_views_view_fields(&$vars) {
-  $view = $vars['view'];
-
+function template_preprocess_views_view_fields(&$variables) {
+  $view = $variables['view'];
   // Loop through the fields for this view.
   $previous_inline = FALSE;
-  $vars['fields'] = array(); // ensure it's at least an empty array.
+  $variables['fields'] = array(); // ensure it's at least an empty array.
   foreach ($view->field as $id => $field) {
     // render this even if set to exclude so it can be used elsewhere.
     $field_output = $view->style_plugin->get_field($view->row_index, $id);
     $empty = $field->is_value_empty($field_output, $field->options['empty_zero']);
-    if (empty($field->options['exclude']) && (!$empty || (empty($field->options['hide_empty']) && empty($vars['options']['hide_empty'])))) {
+    if (empty($field->options['exclude']) && (!$empty || (empty($field->options['hide_empty']) && empty($variables['options']['hide_empty'])))) {
       $object = new stdClass();
       $object->handler = &$view->field[$id];
-      $object->inline = !empty($vars['options']['inline'][$id]);
+      $object->inline = !empty($variables['options']['inline'][$id]);
 
-      $object->element_type = $object->handler->element_type(TRUE, !$vars['options']['default_field_elements'], $object->inline);
+      $object->element_type = $object->handler->element_type(TRUE, !$variables['options']['default_field_elements'], $object->inline);
       if ($object->element_type) {
         $attributes = array();
         if ($object->handler->options['element_default_classes']) {
@@ -216,22 +231,22 @@ function template_preprocess_views_view_fields(&$vars) {
       }
 
       $object->content = $field_output;
-      if (isset($view->field[$id]->field_alias) && isset($vars['row']->{$view->field[$id]->field_alias})) {
-        $object->raw = $vars['row']->{$view->field[$id]->field_alias};
+      if (isset($view->field[$id]->field_alias) && isset($variables['row']->{$view->field[$id]->field_alias})) {
+        $object->raw = $variables['row']->{$view->field[$id]->field_alias};
       }
       else {
         $object->raw = NULL; // make sure it exists to reduce NOTICE
       }
 
-      if (!empty($vars['options']['separator']) && $previous_inline && $object->inline && $object->content) {
-        $object->separator = filter_xss_admin($vars['options']['separator']);
+      if (!empty($variables['options']['separator']) && $previous_inline && $object->inline && $object->content) {
+        $object->separator = filter_xss_admin($variables['options']['separator']);
       }
 
       $object->class = drupal_clean_css_identifier($id);
 
       $previous_inline = $object->inline;
       $object->inline_html = $object->handler->element_wrapper_type(TRUE, TRUE);
-      if ($object->inline_html === '' && $vars['options']['default_field_elements']) {
+      if ($object->inline_html === '' && $variables['options']['default_field_elements']) {
         $object->inline_html = $object->inline ? 'span' : 'div';
       }
 
@@ -267,7 +282,7 @@ function template_preprocess_views_view_fields(&$vars) {
           $object->label_html .= ': ';
         }
 
-        $object->element_label_type = $object->handler->element_label_type(TRUE, !$vars['options']['default_field_elements']);
+        $object->element_label_type = $object->handler->element_label_type(TRUE, !$variables['options']['default_field_elements']);
         if ($object->element_label_type) {
           $attributes = array();
           if ($object->handler->options['element_default_classes']) {
@@ -289,7 +304,7 @@ function template_preprocess_views_view_fields(&$vars) {
         }
       }
 
-      $vars['fields'][$id] = $object;
+      $variables['fields'][$id] = $object;
     }
   }