diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 0347dbe..9ff4aa5 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -2325,7 +2325,7 @@ function template_preprocess_item_list(&$variables) {
           }
           // Lastly, inherit the original theme variables of the current list.
           $child['#theme'] = $variables['theme_hook_original'];
-          $child['#type'] = $variables['type'];
+          $child['#list_type'] = $variables['list_type'];
         }
       }
     }
@@ -2341,19 +2341,18 @@ function template_preprocess_item_list(&$variables) {
  *     render arrays. Render arrays can specify list item attributes in the
  *     #wrapper_attributes property.
  *   - title: The title of the list.
- *   - type: The type of list to return (e.g. "ul", "ol").
+ *   - list_type: The type of HTML list (e.g. "ul", "ol").
  *   - attributes: The attributes applied to the list element.
  */
 function theme_item_list($variables) {
   $items = $variables['items'];
   $title = (string) $variables['title'];
-  // @todo 'type' clashes with '#type'. Rename to 'tag'.
-  $type = $variables['type'];
+  $list_type = $variables['list_type'];
   $list_attributes = $variables['attributes'];
 
   $output = '';
   if ($items) {
-    $output .= '<' . $type . new Attribute($list_attributes) . '>';
+    $output .= '<' . $list_type . new Attribute($list_attributes) . '>';
 
     $num_items = count($items);
     $i = 0;
@@ -2375,7 +2374,7 @@ function theme_item_list($variables) {
       }
       $output .= '<li' . new Attribute($attributes) . '>' . $item . '</li>';
     }
-    $output .= "</$type>";
+    $output .= "</$list_type>";
   }
 
   // Only output the list container and title, if there are any list items.
@@ -3174,7 +3173,7 @@ function drupal_common_theme() {
       'variables' => array('type' => MARK_NEW),
     ),
     'item_list' => array(
-      'variables' => array('items' => array(), 'title' => '', 'type' => 'ul', 'attributes' => array()),
+      'variables' => array('items' => array(), 'title' => '', 'list_type' => 'ul', 'attributes' => array()),
     ),
     'more_help_link' => array(
       'variables' => array('url' => NULL),
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 71cdd35..0f27043 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
@@ -634,7 +634,7 @@ function render_items($items) {
           array(
             'items' => $items,
             'title' => NULL,
-            'type' => $this->options['multi_type']
+            'list_type' => $this->options['multi_type'],
           ));
       }
     }
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php
index 1faf6d8..d8505bc 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php
@@ -54,7 +54,7 @@ function testItemList() {
         'childlist' => array(
           '#theme' => 'item_list',
           '#attributes' => array('id' => 'blist'),
-          '#type' => 'ol',
+          '#list_type' => 'ol',
           '#items' => array(
             'ba',
             array(
diff --git a/core/modules/tour/lib/Drupal/tour/TourRenderController.php b/core/modules/tour/lib/Drupal/tour/TourRenderController.php
index e1bf15d..9173cdf 100644
--- a/core/modules/tour/lib/Drupal/tour/TourRenderController.php
+++ b/core/modules/tour/lib/Drupal/tour/TourRenderController.php
@@ -56,7 +56,7 @@ public function viewMultiple(array $entities = array(), $view_mode = 'full', $la
         $build[$entity_id] = array(
           '#theme' => 'item_list',
           '#items' => $list_items,
-          '#type' => 'ol',
+          '#list_type' => 'ol',
           '#attributes' => array(
             'id' => 'tour',
             'class' => array(
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index 57d832a..a78548b 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -1695,12 +1695,11 @@ public function buildOptionsForm(&$form, &$form_state) {
               foreach ($options[$type] as $key => $value) {
                 $items[] = $key . ' == ' . $value;
               }
-              $item_list = array(
-                '#theme' => 'item_list',
-                '#items' => $items,
-                '#type' => $type,
-              );
-              $output .= drupal_render($item_list);
+              $output .= theme('item_list',
+                array(
+                  'items' => $items,
+                  'list_type' => $type,
+                ));
             }
           }
         }
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 8019cf6..05c09be 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
@@ -870,12 +870,11 @@ public function buildOptionsForm(&$form, &$form_state) {
             foreach ($options[$type] as $key => $value) {
               $items[] = $key . ' == ' . $value;
             }
-            $item_list = array(
-              '#theme' => 'item_list',
-              '#items' => $items,
-              '#type' => $type,
-            );
-            $output .= drupal_render($item_list);
+            $output .= theme('item_list',
+              array(
+                'items' => $items,
+                'list_type' => $type,
+              ));
           }
         }
       }
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php
index 4e43e76..72ba9d9 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php
@@ -79,13 +79,12 @@ function render_items($items) {
         return implode($this->sanitizeValue($this->options['separator'], 'xss_admin'), $items);
       }
       else {
-        $item_list = array(
-          '#theme' => 'item_list',
-          '#items' => $items,
-          '#title' => NULL,
-          '#type' => $this->options['type'],
-        );
-        return drupal_render($item_list);
+        return theme('item_list',
+          array(
+            'items' => $items,
+            'title' => NULL,
+            'list_type' => $this->options['type'],
+          ));
       }
     }
   }
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index 10c771b..359b358 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -1185,16 +1185,14 @@ function theme_views_mini_pager($vars) {
     '#wrapper_attributes' => array('class' => array('pager-next')),
   ) + $li_next;
 
-  $item_list = array(
-    '#theme' => 'item_list',
-    '#items' => $items,
-    '#title' => NULL,
-    '#type' => 'ul',
-    '#attributes' => array(
-      'class' => array('pager'),
-    ),
+  return theme('item_list',
+    array(
+      'items' => $items,
+      'title' => NULL,
+      'list_type' => 'ul',
+      'attributes' => array('class' => array('pager')),
+    )
   );
-  return drupal_render($item_list);
 }
 
 /**