diff --git a/setup.py b/setup.py
index db9bdf31e1..195349aa28 100644
--- a/setup.py
+++ b/setup.py
@@ -6,20 +6,20 @@ from setuptools import setup
 
 XBLOCKS = [
     "about = xmodule.html_block:AboutBlock",
-    "book = xmodule.template_module:TranslateCustomTagBlock",
+    "book = xmodule.template_block:TranslateCustomTagBlock",
     "annotatable = xmodule.annotatable_block:AnnotatableBlock",
     "chapter = xmodule.seq_block:SectionBlock",
     "conditional = xmodule.conditional_block:ConditionalBlock",
     "course = xmodule.course_block:CourseBlock",
     "course_info = xmodule.html_block:CourseInfoBlock",
-    "customtag = xmodule.template_module:CustomTagBlock",
-    "custom_tag_template = xmodule.template_module:CustomTagTemplateBlock",
-    "discuss = xmodule.template_module:TranslateCustomTagBlock",
+    "customtag = xmodule.template_block:CustomTagBlock",
+    "custom_tag_template = xmodule.template_block:CustomTagTemplateBlock",
+    "discuss = xmodule.template_block:TranslateCustomTagBlock",
     "discussion = xmodule.discussion_block:DiscussionXBlock",
     "error = xmodule.error_block:ErrorBlock",
     "hidden = xmodule.hidden_block:HiddenDescriptor",
     "html = xmodule.html_block:HtmlBlock",
-    "image = xmodule.template_module:TranslateCustomTagBlock",
+    "image = xmodule.template_block:TranslateCustomTagBlock",
     "library = xmodule.library_root_xblock:LibraryRoot",
     "library_content = xmodule.library_content_block:LibraryContentBlock",
     "library_sourced = xmodule.library_sourced_block:LibrarySourcedBlock",
@@ -28,14 +28,14 @@ XBLOCKS = [
     "problem = xmodule.capa_block:ProblemBlock",
     "randomize = xmodule.randomize_block:RandomizeBlock",
     "sequential = xmodule.seq_block:SequenceBlock",
-    "slides = xmodule.template_module:TranslateCustomTagBlock",
+    "slides = xmodule.template_block:TranslateCustomTagBlock",
     "split_test = xmodule.split_test_module:SplitTestBlock",
     "static_tab = xmodule.html_block:StaticTabBlock",
     "unit = xmodule.unit_block:UnitBlock",
     "vertical = xmodule.vertical_block:VerticalBlock",
     "video = xmodule.video_module:VideoBlock",
     "videoalpha = xmodule.video_module:VideoBlock",
-    "videodev = xmodule.template_module:TranslateCustomTagBlock",
+    "videodev = xmodule.template_block:TranslateCustomTagBlock",
     "word_cloud = xmodule.word_cloud_module:WordCloudBlock",
     "wrapper = xmodule.wrapper_module:WrapperBlock",
 ]
diff --git a/xmodule/static_content.py b/xmodule/static_content.py
index d3ef5a4781..32000dec83 100755
--- a/xmodule/static_content.py
+++ b/xmodule/static_content.py
@@ -28,7 +28,7 @@ from xmodule.lti_block import LTIBlock
 from xmodule.poll_block import PollBlock
 from xmodule.seq_block import SequenceBlock
 from xmodule.split_test_module import SplitTestBlock
-from xmodule.template_module import CustomTagBlock
+from xmodule.template_block import CustomTagBlock
 from xmodule.word_cloud_module import WordCloudBlock
 from xmodule.x_module import HTMLSnippet
 
diff --git a/xmodule/template_module.py b/xmodule/template_block.py
similarity index 96%
rename from xmodule/template_module.py
rename to xmodule/template_block.py
index 3cf347eaac..e83a2a34df 100644
--- a/xmodule/template_module.py
+++ b/xmodule/template_block.py
@@ -1,5 +1,5 @@
 """
-Template module
+Template block
 """
 
 from string import Template
@@ -111,9 +111,9 @@ class CustomTagBlock(CustomTagTemplateBlock):  # pylint: disable=abstract-method
         # cdodge: look up the template as a module
         template_loc = self.location.replace(category='custom_tag_template', name=template_name)
 
-        template_module = system.load_item(template_loc)
-        template_module_data = template_module.data
-        template = Template(template_module_data)
+        template_block = system.load_item(template_loc)
+        template_block_data = template_block.data
+        template = Template(template_block_data)
         return template.safe_substitute(params)
 
     @property