diff --git a/cms/djangoapps/contentstore/features/html-editor.py b/cms/djangoapps/contentstore/features/html-editor.py
index b03388c89a..c3e0afa480 100644
--- a/cms/djangoapps/contentstore/features/html-editor.py
+++ b/cms/djangoapps/contentstore/features/html-editor.py
@@ -14,4 +14,4 @@ def i_created_blank_html_page(step):
 
 @step('I see only the HTML display name setting$')
 def i_see_only_the_html_display_name(step):
-    world.verify_all_setting_entries([['Display Name', "Blank HTML Page", False]])
+    world.verify_all_setting_entries([['Display Name', "Text", False]])
diff --git a/cms/djangoapps/contentstore/features/video-editor.py b/cms/djangoapps/contentstore/features/video-editor.py
index e0f76b30ad..93d638e621 100644
--- a/cms/djangoapps/contentstore/features/video-editor.py
+++ b/cms/djangoapps/contentstore/features/video-editor.py
@@ -7,7 +7,7 @@ from lettuce import world, step
 @step('I see the correct settings and default values$')
 def i_see_the_correct_settings_and_values(step):
     world.verify_all_setting_entries([['Default Speed', 'OEoXaMPEzfM', False],
-                                      ['Display Name', 'Video Title', False],
+                                      ['Display Name', 'Video', False],
                                       ['Download Track', '', False],
                                       ['Download Video', '', False],
                                       ['Show Captions', 'True', False],
diff --git a/common/lib/xmodule/xmodule/discussion_module.py b/common/lib/xmodule/xmodule/discussion_module.py
index fac6a498e5..2c6cc9f4dd 100644
--- a/common/lib/xmodule/xmodule/discussion_module.py
+++ b/common/lib/xmodule/xmodule/discussion_module.py
@@ -12,10 +12,14 @@ class DiscussionFields(object):
     display_name = String(
         display_name="Display Name",
         help="Display name for this module",
-        default="Discussion Tag",
-        scope=Scope.settings)
-    data = String(help="XML data for the problem", scope=Scope.content,
-        default="<discussion></discussion>")
+        default="Discussion",
+        scope=Scope.settings
+    )
+    data = String(
+        help="XML data for the problem",
+        scope=Scope.content,
+        default="<discussion></discussion>"
+    )
     discussion_category = String(
         display_name="Category",
         default="Week 1",
diff --git a/common/lib/xmodule/xmodule/html_module.py b/common/lib/xmodule/xmodule/html_module.py
index a482a86fe7..1cc7bed948 100644
--- a/common/lib/xmodule/xmodule/html_module.py
+++ b/common/lib/xmodule/xmodule/html_module.py
@@ -25,7 +25,7 @@ class HtmlFields(object):
         scope=Scope.settings,
         # it'd be nice to have a useful default but it screws up other things; so,
         # use display_name_with_default for those
-        default="Blank HTML Page"
+        default="Text"
     )
     data = String(help="Html contents to display for this module", default=u"", scope=Scope.content)
     source_code = String(help="Source code for LaTeX documents. This feature is not well-supported.", scope=Scope.settings)
diff --git a/common/lib/xmodule/xmodule/video_module.py b/common/lib/xmodule/xmodule/video_module.py
index 1d9ad35135..6c5640346e 100644
--- a/common/lib/xmodule/xmodule/video_module.py
+++ b/common/lib/xmodule/xmodule/video_module.py
@@ -27,11 +27,13 @@ class VideoFields(object):
         scope=Scope.settings,
         # it'd be nice to have a useful default but it screws up other things; so,
         # use display_name_with_default for those
-        default="Video Title"
+        default="Video"
     )
-    data = String(help="XML data for the problem",
+    data = String(
+        help="XML data for the problem",
         default='',
-        scope=Scope.content)
+        scope=Scope.content
+    )
     position = Integer(help="Current position in the video", scope=Scope.user_state, default=0)
     show_captions = Boolean(help="This controls whether or not captions are shown by default.", display_name="Show Captions", scope=Scope.settings, default=True)
     youtube_id_1_0 = String(help="This is the Youtube ID reference for the normal speed video.", display_name="Default Speed", scope=Scope.settings, default="OEoXaMPEzfM")
diff --git a/lms/djangoapps/courseware/tests/test_module_render.py b/lms/djangoapps/courseware/tests/test_module_render.py
index 7a2afc8af1..6b409f677b 100644
--- a/lms/djangoapps/courseware/tests/test_module_render.py
+++ b/lms/djangoapps/courseware/tests/test_module_render.py
@@ -221,7 +221,7 @@ class TestTOC(TestCase):
                         'format': '', 'due': None, 'active': False},
                        {'url_name': 'video_123456789012', 'display_name': 'Test Video', 'graded': True,
                         'format': '', 'due': None, 'active': False},
-                       {'url_name': 'video_4f66f493ac8f', 'display_name': 'Video Title', 'graded': True,
+                       {'url_name': 'video_4f66f493ac8f', 'display_name': 'Video', 'graded': True,
                         'format': '', 'due': None, 'active': False}],
                       'url_name': 'Overview', 'display_name': u'Overview'},
                      {'active': False, 'sections':
@@ -230,7 +230,6 @@ class TestTOC(TestCase):
                       'url_name': 'secret:magic', 'display_name': 'secret:magic'}])
 
         actual = render.toc_for_course(self.portal_user, request, self.toy_course, chapter, None, model_data_cache)
-        print actual
         assert reduce(lambda x, y: x and (y in actual), expected, True)
 
     def test_toc_toy_from_section(self):
@@ -249,7 +248,7 @@ class TestTOC(TestCase):
                         'format': '', 'due': None, 'active': True},
                        {'url_name': 'video_123456789012', 'display_name': 'Test Video', 'graded': True,
                         'format': '', 'due': None, 'active': False},
-                       {'url_name': 'video_4f66f493ac8f', 'display_name': 'Video Title', 'graded': True,
+                       {'url_name': 'video_4f66f493ac8f', 'display_name': 'Video', 'graded': True,
                         'format': '', 'due': None, 'active': False}],
                       'url_name': 'Overview', 'display_name': u'Overview'},
                      {'active': False, 'sections':