diff --git a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
index fcce642bc2..93be163194 100644
--- a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
+++ b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load wagtailadmin_tags i18n static gravatar %}
+{% load wagtailadmin_tags i18n staticfiles gravatar %}
 
 {% block extra_css %}
     {{ block.super }}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html
index bf74cd2d71..6c192a26bc 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/admin_base.html" %}
-{% load static i18n %}
+{% load staticfiles i18n %}
 {% block titletag %}{% trans "Reset password" %}{% endblock %}
 {% block bodyclass %}login{% endblock %}
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html
index ca52faaefc..0643096f17 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/admin_base.html" %}
-{% load static i18n %}
+{% load staticfiles i18n %}
 {% block titletag %}{% trans "Set your new password" %}{% endblock %}
 {% block bodyclass %}login{% endblock %}
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html
index 2cffc5ce0e..ac8b3112ef 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/admin_base.html" %}
-{% load static i18n %}
+{% load staticfiles i18n %}
 {% block titletag %}{% trans "Reset password" %}{% endblock %}
 {% block bodyclass %}login{% endblock %}
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html
index e3e29b5206..4b97fe100d 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/admin_base.html" %}
-{% load static i18n %}
+{% load staticfiles i18n %}
 {% block titletag %}{% trans "Reset password" %}{% endblock %}
 {% block bodyclass %}login{% endblock %}
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
index f40ee1bd44..cc370eb37d 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/skeleton.html" %}
-{% load static wagtailadmin_tags %}
+{% load staticfiles wagtailadmin_tags %}
 
 {% block css %}
     <link rel="stylesheet" href="{% static 'wagtailadmin/css/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css' %}" />
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/base.html
index 5b6ae785a7..f2e5672933 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/base.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/admin_base.html" %}
-{% load wagtailadmin_tags wagtailcore_tags static i18n %}
+{% load wagtailadmin_tags wagtailcore_tags staticfiles i18n %}
 
 {% block furniture %}
     <div class="nav-wrapper">
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home.html b/wagtail/wagtailadmin/templates/wagtailadmin/home.html
index 06975994f2..63ecf7cd98 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/home.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/home.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load gravatar static i18n %}
+{% load gravatar staticfiles i18n %}
 {% block titletag %}{% trans "Dashboard" %}{% endblock %}
 {% block bodyclass %}homepage{% endblock %}
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home/upgrade_notification.html b/wagtail/wagtailadmin/templates/wagtailadmin/home/upgrade_notification.html
index 5c7dec9519..9a69a20531 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/home/upgrade_notification.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/home/upgrade_notification.html
@@ -1,4 +1,4 @@
-{% load wagtailcore_tags static %}
+{% load wagtailcore_tags staticfiles %}
 
 <div class="panel nice-padding panel-upgrade-notification" style="display:none">
     <div class="help-block help-warning">Wagtail upgrade available. Your version: <strong>{% wagtail_version %}</strong>. New version: <strong class="newversion"></strong>. <a class="releasenotes-link" href="">Read the release notes.</a></div>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/login.html b/wagtail/wagtailadmin/templates/wagtailadmin/login.html
index ddb4a7e0cb..8e696057df 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/login.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/login.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/admin_base.html" %}
-{% load static i18n %}
+{% load staticfiles i18n %}
 {% block titletag %}{% trans "Sign in" %}{% endblock %}
 {% block bodyclass %}login{% endblock %}
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html
index b39cb8bc75..2de738b9a8 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html
@@ -1,4 +1,4 @@
-{% load wagtailadmin_tags static %}
+{% load wagtailadmin_tags staticfiles %}
 
 {% comment %}
     CSS declarations to be included on the 'create page' and 'edit page' views
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
index 805287a815..cd92a14b7b 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
@@ -1,4 +1,4 @@
-{% load wagtailadmin_tags static %}
+{% load wagtailadmin_tags staticfiles %}
 
 {% comment %}
     Javascript declarations to be included on the 'create page' and 'edit page' views
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
index c29a65a562..63f9a256c2 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load wagtailadmin_tags static i18n %}
+{% load wagtailadmin_tags staticfiles i18n %}
 {% block titletag %}{% blocktrans with title=parent_page.title %}Exploring {{ title }}{% endblocktrans %}{% endblock %}
 {% block bodyclass %}page-explorer {% if ordering == 'ord' %}reordering{% endif %}{% endblock %}
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
index 9cde079a9f..ebb36adeee 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML>
-{% load static i18n %}
+{% load staticfiles i18n %}
 <html>
     <head>
         <title>{% trans "Preview" %}</title>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
index 2dbbe50ef7..d40fbcebf0 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
@@ -1,5 +1,5 @@
 <!doctype html>
-{% load static i18n %}
+{% load staticfiles i18n %}
 <html class="no-js" lang="{{ LANGUAGE_CODE|default:"en-gb" }}">
 <head>
     <meta charset="utf-8" />
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html
index f742f4f5a0..5310c4373a 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/skeleton.html" %}
-{% load static i18n %}
+{% load staticfiles i18n %}
 
 {% block titletag %}{% trans 'User bar' %}{% endblock %}
 {% block css %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html
index ec5f68cbe7..c605ef053f 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/frame.html
@@ -1,4 +1,4 @@
-{% load static %}
+{% load staticfiles %}
 <!-- Wagtail user bar embed code -->
 <script type="text/javascript">
     var wagtail = wagtail || {};
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
index 2d074da216..c2ffc30fff 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load wagtailimages_tags static i18n %}
+{% load wagtailimages_tags staticfiles i18n %}
 {% block titletag %}{% blocktrans with title=image.title %}Editing image {{ title }}{% endblocktrans %}{% endblock %}
 {% block extra_css %}
     {{ block.super }}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html b/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html
index 74faded5cf..3024a05f3e 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load wagtailimages_tags static i18n %}
+{% load wagtailimages_tags staticfiles i18n %}
 
 {% block titletag %}{% blocktrans with title=image.title %}Editing image {{ title }}{% endblocktrans %}{% endblock %}
 
diff --git a/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html b/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html
index 66f1975322..7971f59669 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load wagtailimages_tags i18n static %}
+{% load wagtailimages_tags i18n staticfiles %}
 {% block titletag %}{% trans "Add multiple images" %}{% endblock %}
 {% block extra_css %}
     {{ block.super }}
diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/create.html b/wagtail/wagtailusers/templates/wagtailusers/groups/create.html
index 815b965a15..9ffcd935da 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/groups/create.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/groups/create.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load wagtailusers_tags wagtailimages_tags static i18n %}
+{% load wagtailusers_tags wagtailimages_tags staticfiles i18n %}
 
 {% block titletag %}{% trans "Add group" %}{% endblock %}
 
diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html b/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html
index 07a8de6017..5fd8d7186f 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load wagtailusers_tags static i18n %}
+{% load wagtailusers_tags staticfiles i18n %}
 
 {% block titletag %}{% trans "Editing" %} {{ group.name }}{% endblock %}
 
diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/includes/group_form_js.html b/wagtail/wagtailusers/templates/wagtailusers/groups/includes/group_form_js.html
index e3c7f6ebdf..0a1f04c8be 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/groups/includes/group_form_js.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/groups/includes/group_form_js.html
@@ -1,4 +1,4 @@
-{% load static %}
+{% load staticfiles %}
 <script>
     window.chooserUrls = {
         'pageChooser': '{% url "wagtailadmin_choose_page" %}'