diff --git a/lms/djangoapps/courseware/tests/test_word_cloud.py b/lms/djangoapps/courseware/tests/test_word_cloud.py
index e80c73332d..2ba9ba8374 100644
--- a/lms/djangoapps/courseware/tests/test_word_cloud.py
+++ b/lms/djangoapps/courseware/tests/test_word_cloud.py
@@ -10,7 +10,7 @@ from .helpers import BaseTestXmodule
 
 
 class TestWordCloud(BaseTestXmodule):
-    """Integration test for word cloud xmodule."""
+    """Integration test for Word Cloud Block."""
     CATEGORY = "word_cloud"
 
     def _get_resource_url(self, item):
diff --git a/setup.py b/setup.py
index 195349aa28..de935056d3 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@ XBLOCKS = [
     "video = xmodule.video_module:VideoBlock",
     "videoalpha = xmodule.video_module:VideoBlock",
     "videodev = xmodule.template_block:TranslateCustomTagBlock",
-    "word_cloud = xmodule.word_cloud_module:WordCloudBlock",
+    "word_cloud = xmodule.word_cloud_block:WordCloudBlock",
     "wrapper = xmodule.wrapper_module:WrapperBlock",
 ]
 XBLOCKS_ASIDES = [
diff --git a/xmodule/static_content.py b/xmodule/static_content.py
index 32000dec83..692233ee4c 100755
--- a/xmodule/static_content.py
+++ b/xmodule/static_content.py
@@ -29,7 +29,7 @@ from xmodule.poll_block import PollBlock
 from xmodule.seq_block import SequenceBlock
 from xmodule.split_test_module import SplitTestBlock
 from xmodule.template_block import CustomTagBlock
-from xmodule.word_cloud_module import WordCloudBlock
+from xmodule.word_cloud_block import WordCloudBlock
 from xmodule.x_module import HTMLSnippet
 
 LOG = logging.getLogger(__name__)
diff --git a/xmodule/tests/test_word_cloud.py b/xmodule/tests/test_word_cloud.py
index 17f91afab7..79923d7c88 100644
--- a/xmodule/tests/test_word_cloud.py
+++ b/xmodule/tests/test_word_cloud.py
@@ -1,4 +1,4 @@
-"""Test for Word cloud Xmodule functional logic."""
+"""Test for Word Cloud Block functional logic."""
 
 import json
 from unittest.mock import Mock
@@ -10,13 +10,13 @@ from opaque_keys.edx.locator import BlockUsageLocator, CourseLocator
 from webob.multidict import MultiDict
 from xblock.field_data import DictFieldData
 
-from xmodule.word_cloud_module import WordCloudBlock
+from xmodule.word_cloud_block import WordCloudBlock
 from . import get_test_descriptor_system, get_test_system
 
 
 class WordCloudBlockTest(TestCase):
     """
-    Logic tests for Word Cloud XBlock.
+    Logic tests for Word Cloud Block.
     """
 
     raw_field_data = {
diff --git a/xmodule/word_cloud_module.py b/xmodule/word_cloud_block.py
similarity index 100%
rename from xmodule/word_cloud_module.py
rename to xmodule/word_cloud_block.py