diff --git a/zinnia/templatetags/zinnia.py b/zinnia/templatetags/zinnia.py
index d45e3f60e..9d86c22ce 100644
--- a/zinnia/templatetags/zinnia.py
+++ b/zinnia/templatetags/zinnia.py
@@ -40,7 +40,7 @@
 from ..models.entry import Entry
 from ..settings import ENTRY_LOOP_TEMPLATES
 from ..settings import PROTOCOL
-from ..templates import loop_template_list
+from ..templating import loop_template_list
 
 
 WIDONT_REGEXP = re.compile(
diff --git a/zinnia/templates.py b/zinnia/templating.py
similarity index 100%
rename from zinnia/templates.py
rename to zinnia/templating.py
diff --git a/zinnia/tests/test_templates.py b/zinnia/tests/test_templating.py
similarity index 95%
rename from zinnia/tests/test_templates.py
rename to zinnia/tests/test_templating.py
index 295c12a15..0651d804e 100644
--- a/zinnia/tests/test_templates.py
+++ b/zinnia/tests/test_templating.py
@@ -1,8 +1,8 @@
 """Test cases for Zinnia Template"""
 from django.test import TestCase
 
-from zinnia.templates import append_position
-from zinnia.templates import loop_template_list
+from zinnia.templating import append_position
+from zinnia.templating import loop_template_list
 
 
 class TemplateTestCase(TestCase):