diff --git a/xmodule/annotatable_block.py b/xmodule/annotatable_block.py
index 760fdd724f..1711664836 100644
--- a/xmodule/annotatable_block.py
+++ b/xmodule/annotatable_block.py
@@ -11,7 +11,7 @@ from xblock.fields import Scope, String
 
 from openedx.core.djangolib.markup import HTML, Text
 from xmodule.editing_block import EditingMixin
-from xmodule.raw_module import RawMixin
+from xmodule.raw_block import RawMixin
 from xmodule.util.xmodule_django import add_webpack_to_fragment
 from xmodule.xml_module import XmlMixin
 from xmodule.x_module import (
diff --git a/xmodule/capa_block.py b/xmodule/capa_block.py
index c3efb133cb..c8b928cb01 100644
--- a/xmodule/capa_block.py
+++ b/xmodule/capa_block.py
@@ -35,7 +35,7 @@ from xmodule.contentstore.django import contentstore
 from xmodule.editing_block import EditingMixin
 from xmodule.exceptions import NotFoundError, ProcessingError
 from xmodule.graders import ShowCorrectness
-from xmodule.raw_module import RawMixin
+from xmodule.raw_block import RawMixin
 from xmodule.util.sandboxing import SandboxService
 from xmodule.util.xmodule_django import add_webpack_to_fragment
 from xmodule.x_module import (
diff --git a/xmodule/hidden_block.py b/xmodule/hidden_block.py
index 5999b777e0..4aa2987c25 100644
--- a/xmodule/hidden_block.py
+++ b/xmodule/hidden_block.py
@@ -4,7 +4,7 @@ The Hidden XBlock.
 
 from web_fragments.fragment import Fragment
 from xblock.core import XBlock
-from xmodule.raw_module import RawMixin
+from xmodule.raw_block import RawMixin
 from xmodule.xml_module import XmlMixin
 from xmodule.x_module import (
     XModuleMixin,
diff --git a/xmodule/lti_block.py b/xmodule/lti_block.py
index dc68bd41a5..5cb3e00fd6 100644
--- a/xmodule/lti_block.py
+++ b/xmodule/lti_block.py
@@ -84,7 +84,7 @@ from common.djangoapps.xblock_django.constants import (
     ATTR_KEY_USER_ROLE,
 )
 from xmodule.lti_2_util import LTI20BlockMixin, LTIError
-from xmodule.raw_module import EmptyDataRawMixin
+from xmodule.raw_block import EmptyDataRawMixin
 from xmodule.util.xmodule_django import add_webpack_to_fragment
 from xmodule.xml_module import XmlMixin
 from xmodule.x_module import (
diff --git a/xmodule/raw_module.py b/xmodule/raw_block.py
similarity index 100%
rename from xmodule/raw_module.py
rename to xmodule/raw_block.py
diff --git a/xmodule/template_module.py b/xmodule/template_module.py
index 692fbea3a4..3cf347eaac 100644
--- a/xmodule/template_module.py
+++ b/xmodule/template_module.py
@@ -9,7 +9,7 @@ from lxml import etree
 from pkg_resources import resource_string
 from web_fragments.fragment import Fragment
 from xmodule.editing_block import EditingMixin
-from xmodule.raw_module import RawMixin
+from xmodule.raw_block import RawMixin
 from xmodule.util.xmodule_django import add_webpack_to_fragment
 from xmodule.x_module import (
     HTMLSnippet,
diff --git a/xmodule/video_module/video_module.py b/xmodule/video_module/video_module.py
index b8005111da..e9f191ad62 100644
--- a/xmodule/video_module/video_module.py
+++ b/xmodule/video_module/video_module.py
@@ -39,7 +39,7 @@ from xmodule.editing_block import EditingMixin
 from xmodule.exceptions import NotFoundError
 from xmodule.mako_block import MakoTemplateBlockBase
 from xmodule.modulestore.inheritance import InheritanceKeyValueStore, own_metadata
-from xmodule.raw_module import EmptyDataRawMixin
+from xmodule.raw_block import EmptyDataRawMixin
 from xmodule.validation import StudioValidation, StudioValidationMessage
 from xmodule.util.xmodule_django import add_webpack_to_fragment
 from xmodule.video_module import manage_video_subtitles_save
diff --git a/xmodule/word_cloud_module.py b/xmodule/word_cloud_module.py
index dfad29c4e3..cf458a1c7a 100644
--- a/xmodule/word_cloud_module.py
+++ b/xmodule/word_cloud_module.py
@@ -16,7 +16,7 @@ from web_fragments.fragment import Fragment
 from xblock.core import XBlock
 from xblock.fields import Boolean, Dict, Integer, List, Scope, String
 from xmodule.editing_block import EditingMixin
-from xmodule.raw_module import EmptyDataRawMixin
+from xmodule.raw_block import EmptyDataRawMixin
 from xmodule.util.xmodule_django import add_webpack_to_fragment
 from xmodule.xml_module import XmlMixin
 from xmodule.x_module import (