diff --git a/core/lib/Drupal/Component/Datetime/DateTimeBase.php b/core/lib/Drupal/Component/Datetime/DateTimeBase.php
index 35f349c..d7cb5fd 100644
--- a/core/lib/Drupal/Component/Datetime/DateTimeBase.php
+++ b/core/lib/Drupal/Component/Datetime/DateTimeBase.php
@@ -661,7 +661,7 @@ function format($format, $settings = array()) {
     $format_string_type = isset($settings['format_string_type']) ? $settings['format_string_type'] : self::PHP;
     $locale   = !empty($settings['locale'])   ? $settings['locale']   : $this->locale;
     $calendar = !empty($settings['calendar']) ? $settings['calendar'] : $this->calendar;
-    $timezone = !empty($settings['timezone']) ? $settings['timezone'] : $this->getTimezone()->getName();
+    $time_zone = !empty($settings['timezone']) ? $settings['timezone'] : $this->getTimezone()->getName();
     $lenient  = !empty($settings['lenient'])  ? $settings['lenient']  : FALSE;
 
     // Format the date and catch errors.
@@ -683,9 +683,9 @@ function format($format, $settings = array()) {
           $calendar_type = \IntlDateFormatter::TRADITIONAL;
         }
 
-        $datetype = !empty($settings['datetype']) ? $settings['datetype'] : \IntlDateFormatter::FULL;
-        $timetype = !empty($settings['timetype']) ? $settings['timetype'] : \IntlDateFormatter::FULL;
-        $formatter = new \IntlDateFormatter($locale, $datetype, $timetype, $timezone, $calendar_type);
+        $date_type = !empty($settings['datetype']) ? $settings['datetype'] : \IntlDateFormatter::FULL;
+        $time_type = !empty($settings['timetype']) ? $settings['timetype'] : \IntlDateFormatter::FULL;
+        $formatter = new \IntlDateFormatter($locale, $date_type, $time_type, $time_zone, $calendar_type);
         $formatter->setLenient($lenient);
         $value = $formatter->format($format);
       }