diff --git a/cfp/templates/cfp/admin/base.html b/cfp/templates/cfp/admin/base.html
index bdaae40..671cb63 100644
--- a/cfp/templates/cfp/admin/base.html
+++ b/cfp/templates/cfp/admin/base.html
@@ -1,5 +1,5 @@
{% extends 'base.html' %}
-{% load staticfiles i18n %}
+{% load static i18n %}
{% block admintab %} class="active"{% endblock %}
diff --git a/cfp/templates/cfp/staff/base.html b/cfp/templates/cfp/staff/base.html
index cd38fa9..c291e7a 100644
--- a/cfp/templates/cfp/staff/base.html
+++ b/cfp/templates/cfp/staff/base.html
@@ -1,5 +1,5 @@
{% extends 'base.html' %}
-{% load staticfiles i18n %}
+{% load static i18n %}
{% block stafftab %} class="active"{% endblock %}
diff --git a/cfp/templates/cfp/staff/speaker_email.html b/cfp/templates/cfp/staff/speaker_email.html
index 1c44d3a..a659d58 100644
--- a/cfp/templates/cfp/staff/speaker_email.html
+++ b/cfp/templates/cfp/staff/speaker_email.html
@@ -1,5 +1,5 @@
{% extends 'cfp/staff/base.html' %}
-{% load i18n bootstrap3 staticfiles %}
+{% load i18n bootstrap3 static %}
{% block speakerstab %} class="active"{% endblock %}
diff --git a/cfp/templates/cfp/staff/talk_email.html b/cfp/templates/cfp/staff/talk_email.html
index fb91066..42f4533 100644
--- a/cfp/templates/cfp/staff/talk_email.html
+++ b/cfp/templates/cfp/staff/talk_email.html
@@ -1,5 +1,5 @@
{% extends 'cfp/staff/base.html' %}
-{% load i18n bootstrap3 staticfiles %}
+{% load i18n bootstrap3 static %}
{% block talkstab %} class="active"{% endblock %}
diff --git a/cfp/templates/cfp/staff/volunteer_email.html b/cfp/templates/cfp/staff/volunteer_email.html
index 99fd2e2..6473b55 100644
--- a/cfp/templates/cfp/staff/volunteer_email.html
+++ b/cfp/templates/cfp/staff/volunteer_email.html
@@ -1,5 +1,5 @@
{% extends 'cfp/staff/base.html' %}
-{% load i18n bootstrap3 staticfiles %}
+{% load i18n bootstrap3 static %}
{% block volunteerstab %} class="active"{% endblock %}
diff --git a/ponyconf/templates/_base.html b/ponyconf/templates/_base.html
index 091d020..bc80aaf 100644
--- a/ponyconf/templates/_base.html
+++ b/ponyconf/templates/_base.html
@@ -1,4 +1,4 @@
-{% load staticfiles bootstrap3 %}
+{% load static bootstrap3 %}