diff --git a/doc/template/tmpl/container.tmpl b/doc/template/tmpl/container.tmpl
index 62f827e9cf..c546088e67 100644
--- a/doc/template/tmpl/container.tmpl
+++ b/doc/template/tmpl/container.tmpl
@@ -13,7 +13,7 @@
     <h2><?js if (doc.ancestors && doc.ancestors.length) { ?>
         <span class="ancestors"><?js= doc.ancestors.join('') ?></span>
     <?js } ?>
-    <?js= doc.name ?>
+    <?js= doc.longname ?>
     <?js if (doc.variation) { ?>
         <sup class="variation"><?js= doc.variation ?></sup>
     <?js } ?></h2>
@@ -75,7 +75,7 @@
         <h3 class="subsection-title">Classes</h3>
         
         <dl><?js classes.forEach(function(c) { ?>
-            <dt><?js= self.linkto(c.longname, c.name) ?></dt>
+            <dt><?js= self.linkto(c.longname, c.longname) ?></dt>
             <dd><?js if (c.summary) { ?><?js= c.summary ?><?js } ?></dd>
         <?js }); ?></dl>
     <?js } ?>
@@ -87,7 +87,7 @@
         <h3 class="subsection-title">Namespaces</h3>
         
         <dl><?js namespaces.forEach(function(n) { ?>
-            <dt><a href="namespaces.html#<?js= n.longname ?>"><?js= self.linkto(n.longname, n.name) ?></a></dt>
+            <dt><a href="namespaces.html#<?js= n.longname ?>"><?js= self.linkto(n.longname, n.longname) ?></a></dt>
             <dd><?js if (n.summary) { ?><?js= n.summary ?><?js } ?></dd>
         <?js }); ?></dl>
     <?js } ?>