diff --git a/setup.py b/setup.py
index aead87f33e..af82d6246b 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ from setuptools import setup
 XBLOCKS = [
     "about = xmodule.html_module:AboutBlock",
     "book = xmodule.template_module:TranslateCustomTagBlock",
-    "annotatable = xmodule.annotatable_module:AnnotatableBlock",
+    "annotatable = xmodule.annotatable_block:AnnotatableBlock",
     "chapter = xmodule.seq_module:SectionBlock",
     "conditional = xmodule.conditional_module:ConditionalBlock",
     "course = xmodule.course_module:CourseBlock",
diff --git a/xmodule/annotatable_module.py b/xmodule/annotatable_block.py
similarity index 100%
rename from xmodule/annotatable_module.py
rename to xmodule/annotatable_block.py
diff --git a/xmodule/static_content.py b/xmodule/static_content.py
index c2880edb54..b2f28411bd 100755
--- a/xmodule/static_content.py
+++ b/xmodule/static_content.py
@@ -19,7 +19,7 @@ import django
 from docopt import docopt
 from path import Path as path
 
-from xmodule.annotatable_module import AnnotatableBlock
+from xmodule.annotatable_block import AnnotatableBlock
 from xmodule.capa_module import ProblemBlock
 from xmodule.conditional_module import ConditionalBlock
 from xmodule.html_module import AboutBlock, CourseInfoBlock, HtmlBlock, StaticTabBlock
diff --git a/xmodule/tests/test_annotatable_module.py b/xmodule/tests/test_annotatable_block.py
similarity index 99%
rename from xmodule/tests/test_annotatable_module.py
rename to xmodule/tests/test_annotatable_block.py
index 5cdbac7b62..b83be2248e 100644
--- a/xmodule/tests/test_annotatable_module.py
+++ b/xmodule/tests/test_annotatable_block.py
@@ -8,7 +8,7 @@ from opaque_keys.edx.locator import BlockUsageLocator, CourseLocator
 from xblock.field_data import DictFieldData
 from xblock.fields import ScopeIds
 
-from xmodule.annotatable_module import AnnotatableBlock
+from xmodule.annotatable_block import AnnotatableBlock
 
 from . import get_test_system