diff --git a/common/lib/xmodule/setup.py b/common/lib/xmodule/setup.py
index e6c8fe577dfe371ea427e4dac5fba201814d6e44..d3889bc3885a8e35cbc97c9e6166aa853cecddbd 100644
--- a/common/lib/xmodule/setup.py
+++ b/common/lib/xmodule/setup.py
@@ -28,7 +28,7 @@ setup(
             "problem = xmodule.capa_module:CapaDescriptor",
             "problemset = xmodule.seq_module:SequenceDescriptor",
             "section = xmodule.backcompat_module:SemanticSectionDescriptor",
-            "selfassessment = xmodule.self_assessment_module:SelfAssessmentModule"
+            "selfassessment = xmodule.self_assessment_module:SelfAssessmentDescriptor",
             "sequential = xmodule.seq_module:SequenceDescriptor",
             "slides = xmodule.backcompat_module:TranslateCustomTagDescriptor",
             "vertical = xmodule.vertical_module:VerticalDescriptor",
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index c0dd835208ecd6971e67f4a1fc4c89676167646e..b8c2e85ef01b1e02910bd4ac184c6ea3d14ee878 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -45,7 +45,7 @@ class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
     Module for putting raw html in a course
     """
     mako_template = "widgets/html-edit.html"
-    module_class = HtmlModule
+    module_class = SelfAssessmentModule
     filename_extension = "xml"
     template_dir_name = "selfassessment"