diff --git a/setup.py b/setup.py
index 27704d5739..21d849939e 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ XBLOCKS = [
     "library_content = xmodule.library_content_block:LibraryContentBlock",
     "library_sourced = xmodule.library_sourced_block:LibrarySourcedBlock",
     "lti = xmodule.lti_block:LTIBlock",
-    "poll_question = xmodule.poll_module:PollBlock",
+    "poll_question = xmodule.poll_block:PollBlock",
     "problem = xmodule.capa_block:ProblemBlock",
     "randomize = xmodule.randomize_module:RandomizeBlock",
     "sequential = xmodule.seq_module:SequenceBlock",
diff --git a/xmodule/poll_module.py b/xmodule/poll_block.py
similarity index 99%
rename from xmodule/poll_module.py
rename to xmodule/poll_block.py
index 6c51d8360b..575a6574bf 100644
--- a/xmodule/poll_module.py
+++ b/xmodule/poll_block.py
@@ -1,4 +1,4 @@
-"""Poll module is ungraded xmodule used by students to
+"""Poll block is ungraded xmodule used by students to
 to do set of polls.
 
 On the client side we show:
@@ -46,7 +46,7 @@ class PollBlock(
     ResourceTemplates,
     XModuleMixin,
 ):  # pylint: disable=abstract-method
-    """Poll Module"""
+    """Poll Block"""
     # Name of poll to use in links to this poll
     display_name = String(
         help=_("The display name for this component."),
diff --git a/xmodule/static_content.py b/xmodule/static_content.py
index 138ddc1869..ff586869e8 100755
--- a/xmodule/static_content.py
+++ b/xmodule/static_content.py
@@ -25,7 +25,7 @@ from xmodule.conditional_block import ConditionalBlock
 from xmodule.html_block import AboutBlock, CourseInfoBlock, HtmlBlock, StaticTabBlock
 from xmodule.library_content_block import LibraryContentBlock
 from xmodule.lti_block import LTIBlock
-from xmodule.poll_module import PollBlock
+from xmodule.poll_block import PollBlock
 from xmodule.seq_module import SequenceBlock
 from xmodule.split_test_module import SplitTestBlock
 from xmodule.template_module import CustomTagBlock
diff --git a/xmodule/tests/test_poll.py b/xmodule/tests/test_poll.py
index a879de1214..f1a820d6c5 100644
--- a/xmodule/tests/test_poll.py
+++ b/xmodule/tests/test_poll.py
@@ -9,7 +9,7 @@ from xblock.field_data import DictFieldData
 from xblock.fields import ScopeIds
 
 from openedx.core.lib.safe_lxml import etree
-from xmodule.poll_module import PollBlock
+from xmodule.poll_block import PollBlock
 from . import get_test_system
 from .test_import import DummySystem
 
@@ -58,7 +58,7 @@ class PollBlockTest(unittest.TestCase):
 
     def test_poll_export_with_unescaped_characters_xml(self):
         """
-        Make sure that poll_module will export fine if its xml contains
+        Make sure that poll_block will export fine if its xml contains
         unescaped characters.
         """
         module_system = DummySystem(load_error_modules=True)