diff --git a/cms/templates/container.html b/cms/templates/container.html
index dda42724cd..076d9c5649 100644
--- a/cms/templates/container.html
+++ b/cms/templates/container.html
@@ -16,7 +16,7 @@ from django.utils.translation import ugettext as _
 <%
 xblock_info = {
     'id': str(xblock_locator),
-    'display-name': xblock.display_name,
+    'display-name': xblock.display_name_with_default,
     'category': xblock.category,
 };
 %>
@@ -53,10 +53,10 @@ xblock_info = {
                     %>
                     % if parent_url:
                     <a href="${parent_url}"
-                       class="navigation-link navigation-parent">${parent.display_name | h}</a>
+                       class="navigation-link navigation-parent">${parent.display_name_with_default | h}</a>
                     % endif
                 % endfor
-                <a href="#" class="navigation-link navigation-current">${xblock.display_name | h}</a>
+                <a href="#" class="navigation-link navigation-current">${xblock.display_name_with_default | h}</a>
             </small>
         </h1>
 
diff --git a/cms/templates/container_xblock_component.html b/cms/templates/container_xblock_component.html
index 135b1ebe82..cd91f8b50f 100644
--- a/cms/templates/container_xblock_component.html
+++ b/cms/templates/container_xblock_component.html
@@ -7,7 +7,7 @@ from contentstore.views.helpers import xblock_studio_url
 <section class="wrapper-xblock xblock-type-container level-element" data-locator="${locator}">
     <header class="xblock-header">
         <div class="header-details">
-            ${xblock.display_name}
+            ${xblock.display_name_with_default}
         </div>
         <div class="header-actions">
             <ul class="actions-list">
diff --git a/cms/templates/studio_vertical_wrapper.html b/cms/templates/studio_vertical_wrapper.html
index 774b49bf95..226811d790 100644
--- a/cms/templates/studio_vertical_wrapper.html
+++ b/cms/templates/studio_vertical_wrapper.html
@@ -8,7 +8,7 @@
                 <i class="icon-caret-down ui-toggle-expansion"></i>
                 <span class="sr">${_('Expand or Collapse')}</span>
             </a>
-            <span>${xblock.display_name | h}</span>
+            <span>${xblock.display_name_with_default | h}</span>
         </div>
         <div class="header-actions">
             <ul class="actions-list">
diff --git a/cms/templates/studio_xblock_wrapper.html b/cms/templates/studio_xblock_wrapper.html
index 870c2509b4..cd97eeb7fd 100644
--- a/cms/templates/studio_xblock_wrapper.html
+++ b/cms/templates/studio_xblock_wrapper.html
@@ -8,7 +8,7 @@
 % endif
     <header class="xblock-header">
         <div class="header-details">
-            ${xblock.display_name | h}
+            ${xblock.display_name_with_default | h}
         </div>
         <div class="header-actions">
             <ul class="actions-list">