diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index 06029b5e3f..3cafcbde3d 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -194,7 +194,7 @@ class CapaModule(XModule):
         as necessary based on the problem config and state.'''
 
         html = self.lcp.get_html()
-        content = {'name': self.name,
+        content = {'name': self.metadata['display_name'],
                    'html': html,
                    'weight': self.weight,
                   }
diff --git a/lms/templates/problem.html b/lms/templates/problem.html
index 3f79be3b3a..36fcb1bc66 100644
--- a/lms/templates/problem.html
+++ b/lms/templates/problem.html
@@ -1,7 +1,7 @@
 <%namespace name='static' file='static_content.html'/>
 <h2 class="problem-header">
   ${ problem['name'] }
-  % if problem['weight']:
+  % if problem['weight'] != 1:
     : ${ problem['weight'] } points
   % endif