diff --git a/lib/resources/styles.css b/lib/resources/styles.css
index aa1cf21151..b2280457e4 100644
--- a/lib/resources/styles.css
+++ b/lib/resources/styles.css
@@ -599,6 +599,7 @@ ul.subnav li:last-of-type {
 .sidebar ol {
   list-style: none;
   line-height: 22px;
+  margin-top: 0;
   margin-bottom: 0;
   padding: 0 0 15px 0;
 }
diff --git a/lib/src/html/template_data.dart b/lib/src/html/template_data.dart
index aa2c11a2d5..0cdd99f0df 100644
--- a/lib/src/html/template_data.dart
+++ b/lib/src/html/template_data.dart
@@ -69,9 +69,9 @@ abstract class TemplateData<T extends Documentable> {
 
   String _layoutTitle(String name, String kind, bool isDeprecated) {
     if (isDeprecated) {
-      return '${kind} <span class="deprecated">${name}</span>';
+      return '<span class="deprecated">${name}</span> ${kind}';
     } else {
-      return '${kind} ${name}';
+      return '${name} ${kind}';
     }
   }
 
diff --git a/lib/templates/class.html b/lib/templates/class.html
index 240d4c04db..a3aab8fb53 100644
--- a/lib/templates/class.html
+++ b/lib/templates/class.html
@@ -1,11 +1,12 @@
 {{>head}}
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>{{parent.kind}} {{parent.name}}</h5>
+    <h5>{{parent.name}} {{parent.kind}}</h5>
     {{>sidebar_for_library}}
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>{{{self.nameWithGenerics}}} {{self.kind}}</h1>
 
     {{#clazz}}
     {{>documentation}}
@@ -161,7 +162,6 @@ <h2>Constants</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>{{self.kind}} {{self.name}}</h5>
     {{>sidebar_for_class}}
   </div><!--/.sidebar-offcanvas-->
 
diff --git a/lib/templates/constant.html b/lib/templates/constant.html
index a5a93f9757..005e1145b4 100644
--- a/lib/templates/constant.html
+++ b/lib/templates/constant.html
@@ -1,11 +1,12 @@
 {{>head}}
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>{{parent.kind}} {{parent.name}}</h5>
+    <h5>{{parent.name}} {{parent.kind}}</h5>
     {{>sidebar_for_class}}
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>{{self.name}} {{self.kind}}</h1>
 
     <section class="multi-line-signature">
       {{#property}}
@@ -24,7 +25,6 @@ <h5>{{parent.kind}} {{parent.name}}</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>{{self.kind}} {{self.name}}</h5>
   </div><!--/.sidebar-offcanvas-->
 
 {{>footer}}
diff --git a/lib/templates/constructor.html b/lib/templates/constructor.html
index 43a3bce48d..6e279ab2e5 100644
--- a/lib/templates/constructor.html
+++ b/lib/templates/constructor.html
@@ -1,11 +1,13 @@
 {{>head}}
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>{{parent.kind}} {{parent.name}}</h5>
+    <h5>{{parent.name}} {{parent.kind}}</h5>
     {{>sidebar_for_class}}
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>{{{self.nameWithGenerics}}} {{self.kind}}</h1>
+
     {{#constructor}}
     <section class="multi-line-signature">
       {{#hasAnnotations}}
@@ -29,7 +31,6 @@ <h5>{{parent.kind}} {{parent.name}}</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>{{self.kind}} {{self.name}}</h5>
   </div><!--/.sidebar-offcanvas-->
 
 {{>footer}}
diff --git a/lib/templates/enum.html b/lib/templates/enum.html
index 38b24f5102..d0c13a50c5 100644
--- a/lib/templates/enum.html
+++ b/lib/templates/enum.html
@@ -1,11 +1,12 @@
 {{>head}}
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>{{parent.kind}} {{parent.name}}</h5>
+    <h5>{{parent.name}} {{parent.kind}}</h5>
     {{>sidebar_for_library}}
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>{{self.name}} {{self.kind}}</h1>
 
     {{#eNum}}
     {{>documentation}}
@@ -161,7 +162,6 @@ <h2>Static Methods</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>{{self.kind}} {{self.name}}</h5>
     {{>sidebar_for_enum}}
   </div><!--/.sidebar-offcanvas-->
 
diff --git a/lib/templates/function.html b/lib/templates/function.html
index c7abc43296..4b6f826f2a 100644
--- a/lib/templates/function.html
+++ b/lib/templates/function.html
@@ -1,11 +1,12 @@
 {{>head}}
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>{{parent.kind}} {{parent.name}}</h5>
+    <h5>{{parent.name}} {{parent.kind}}</h5>
     {{>sidebar_for_library}}
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>{{{self.nameWithGenerics}}} {{self.kind}}</h1>
 
     {{#function}}
     <section class="multi-line-signature">
@@ -19,7 +20,6 @@ <h5>{{parent.kind}} {{parent.name}}</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>{{self.kind}} {{self.name}}</h5>
   </div><!--/.sidebar-offcanvas-->
 
 {{>footer}}
diff --git a/lib/templates/index.html b/lib/templates/index.html
index a128668c5c..5474e1a448 100644
--- a/lib/templates/index.html
+++ b/lib/templates/index.html
@@ -1,7 +1,7 @@
 {{>head}}
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>{{self.kind}} {{self.name}}</h5>
+    <h5>{{self.name}} {{self.kind}}</h5>
 
     {{#useCategories}}
     <ol>
diff --git a/lib/templates/library.html b/lib/templates/library.html
index fdf7b34ddb..c544b7a22b 100644
--- a/lib/templates/library.html
+++ b/lib/templates/library.html
@@ -1,7 +1,7 @@
 {{>head}}
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>{{parent.kind}} {{parent.name}}</h5>
+    <h5>{{parent.name}} {{parent.kind}}</h5>
     {{#useCategories}}
     <ol>
       {{#package.categories}}
@@ -24,6 +24,7 @@ <h5>{{parent.kind}} {{parent.name}}</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>{{self.name}} {{self.kind}}</h1>
 
     {{#library}}
     {{>documentation}}
@@ -131,7 +132,7 @@ <h2>Exceptions / Errors</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>{{self.kind}} {{self.name}}</h5>
+    <h5>{{self.name}} {{self.kind}}</h5>
     {{>sidebar_for_library}}
   </div><!--/sidebar-offcanvas-right-->
 
diff --git a/lib/templates/method.html b/lib/templates/method.html
index 54250ef57b..3ffa046ed0 100644
--- a/lib/templates/method.html
+++ b/lib/templates/method.html
@@ -1,11 +1,13 @@
 {{>head}}
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>{{parent.kind}} {{parent.name}}</h5>
+    <h5>{{parent.name}} {{parent.kind}}</h5>
     {{>sidebar_for_class}}
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>{{{self.nameWithGenerics}}} {{self.kind}}</h1>
+
     {{#method}}
     <section class="multi-line-signature">
       {{>callable_multiline}}
@@ -18,7 +20,6 @@ <h5>{{parent.kind}} {{parent.name}}</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>{{self.kind}} {{self.name}}</h5>
   </div><!--/.sidebar-offcanvas-->
 
 {{>footer}}
diff --git a/lib/templates/property.html b/lib/templates/property.html
index 0bcf2448ab..ed6fb902d8 100644
--- a/lib/templates/property.html
+++ b/lib/templates/property.html
@@ -1,11 +1,13 @@
 {{>head}}
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>{{parent.kind}} {{parent.name}}</h5>
+    <h5>{{parent.name}} {{parent.kind}}</h5>
     {{>sidebar_for_class}}
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>{{self.name}} {{self.kind}}</h1>
+
     {{#self}}
       {{#hasNoGetterSetter}}
         <section class="multi-line-signature">
@@ -30,7 +32,6 @@ <h5>{{parent.kind}} {{parent.name}}</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>{{self.kind}} {{self.name}}</h5>
   </div><!--/.sidebar-offcanvas-->
 
 {{>footer}}
diff --git a/lib/templates/top_level_constant.html b/lib/templates/top_level_constant.html
index 4a3b581ede..74c5b14774 100644
--- a/lib/templates/top_level_constant.html
+++ b/lib/templates/top_level_constant.html
@@ -1,11 +1,12 @@
 {{>head}}
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>{{parent.kind}} {{parent.name}}</h5>
+    <h5>{{parent.name}} {{parent.kind}}</h5>
     {{>sidebar_for_library}}
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>{{self.name}} {{self.kind}}</h1>
 
     {{#self}}
     <section class="multi-line-signature">
@@ -22,7 +23,6 @@ <h5>{{parent.kind}} {{parent.name}}</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>{{self.kind}} {{self.name}}</h5>
   </div><!--/.sidebar-offcanvas-->
 
 {{>footer}}
diff --git a/lib/templates/top_level_property.html b/lib/templates/top_level_property.html
index 55a8b70fe2..c441796110 100644
--- a/lib/templates/top_level_property.html
+++ b/lib/templates/top_level_property.html
@@ -1,11 +1,13 @@
 {{>head}}
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>{{parent.kind}} {{parent.name}}</h5>
+    <h5>{{parent.name}} {{parent.kind}}</h5>
     {{>sidebar_for_library}}
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>{{self.name}} {{self.kind}}</h1>
+
     {{#self}}
     {{#hasNoGetterSetter}}
     <section class="multi-line-signature">
@@ -28,7 +30,6 @@ <h5>{{parent.kind}} {{parent.name}}</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>{{self.kind}} {{self.name}}</h5>
   </div><!--/.sidebar-offcanvas-->
 
 {{>footer}}
\ No newline at end of file
diff --git a/lib/templates/typedef.html b/lib/templates/typedef.html
index b3b1e73a1a..a642d7e723 100644
--- a/lib/templates/typedef.html
+++ b/lib/templates/typedef.html
@@ -1,11 +1,12 @@
 {{>head}}
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>{{parent.kind}} {{parent.name}}</h5>
+    <h5>{{parent.name}} {{parent.kind}}</h5>
     {{>sidebar_for_library}}
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>{{{self.nameWithGenerics}}} {{self.kind}}</h1>
 
     <section class="multi-line-signature">
       {{#typeDef}}
@@ -21,7 +22,6 @@ <h5>{{parent.kind}} {{parent.name}}</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>{{self.kind}} {{self.name}}</h5>
   </div><!--/.sidebar-offcanvas-->
 
 {{>footer}}
diff --git a/testing/test_package_docs/anonymous_library/anonymous_library-library.html b/testing/test_package_docs/anonymous_library/anonymous_library-library.html
index 07715e77bf..c3dbb524a9 100644
--- a/testing/test_package_docs/anonymous_library/anonymous_library-library.html
+++ b/testing/test_package_docs/anonymous_library/anonymous_library-library.html
@@ -24,7 +24,7 @@
   <button id="sidenav-left-toggle" type="button">&nbsp;</button>
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
-    <li class="self-crumb">library anonymous_library</li>
+    <li class="self-crumb">anonymous_library library</li>
   </ol>
   <div class="self-name">anonymous_library</div>
   <form class="search navbar-right" role="search">
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>package test_package</h5>
+    <h5>test_package package</h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
@@ -54,6 +54,7 @@ <h5>package test_package</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>anonymous_library library</h1>
 
     
 
@@ -81,7 +82,7 @@ <h2>Functions</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>library anonymous_library</h5>
+    <h5>anonymous_library library</h5>
     <ol>
     
     
diff --git a/testing/test_package_docs/anonymous_library/doesStuff.html b/testing/test_package_docs/anonymous_library/doesStuff.html
index b49aa1482f..149b67830f 100644
--- a/testing/test_package_docs/anonymous_library/doesStuff.html
+++ b/testing/test_package_docs/anonymous_library/doesStuff.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
-    <li class="self-crumb">function doesStuff</li>
+    <li class="self-crumb">doesStuff function</li>
   </ol>
   <div class="self-name">doesStuff</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library anonymous_library</h5>
+    <h5>anonymous_library library</h5>
     <ol>
     
     
@@ -50,6 +50,7 @@ <h5>library anonymous_library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>doesStuff function</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">String</span>
@@ -61,7 +62,6 @@ <h5>library anonymous_library</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>function doesStuff</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html b/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html
index 62b4aa97f2..b436738d15 100644
--- a/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html
+++ b/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html
@@ -24,7 +24,7 @@
   <button id="sidenav-left-toggle" type="button">&nbsp;</button>
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
-    <li class="self-crumb">library another_anonymous_lib</li>
+    <li class="self-crumb">another_anonymous_lib library</li>
   </ol>
   <div class="self-name">another_anonymous_lib</div>
   <form class="search navbar-right" role="search">
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>package test_package</h5>
+    <h5>test_package package</h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
@@ -54,6 +54,7 @@ <h5>package test_package</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>another_anonymous_lib library</h1>
 
     
 
@@ -81,7 +82,7 @@ <h2>Functions</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>library another_anonymous_lib</h5>
+    <h5>another_anonymous_lib library</h5>
     <ol>
     
     
diff --git a/testing/test_package_docs/another_anonymous_lib/greeting.html b/testing/test_package_docs/another_anonymous_lib/greeting.html
index afd1ba0789..de1bbcff19 100644
--- a/testing/test_package_docs/another_anonymous_lib/greeting.html
+++ b/testing/test_package_docs/another_anonymous_lib/greeting.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
-    <li class="self-crumb">function greeting</li>
+    <li class="self-crumb">greeting function</li>
   </ol>
   <div class="self-name">greeting</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library another_anonymous_lib</h5>
+    <h5>another_anonymous_lib library</h5>
     <ol>
     
     
@@ -50,6 +50,7 @@ <h5>library another_anonymous_lib</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>greeting function</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">String</span>
@@ -61,7 +62,6 @@ <h5>library another_anonymous_lib</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>function greeting</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/code_in_comments/code_in_comments-library.html b/testing/test_package_docs/code_in_comments/code_in_comments-library.html
index 028aedc46c..885d45c1a3 100644
--- a/testing/test_package_docs/code_in_comments/code_in_comments-library.html
+++ b/testing/test_package_docs/code_in_comments/code_in_comments-library.html
@@ -24,7 +24,7 @@
   <button id="sidenav-left-toggle" type="button">&nbsp;</button>
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
-    <li class="self-crumb">library code_in_comments</li>
+    <li class="self-crumb">code_in_comments library</li>
   </ol>
   <div class="self-name">code_in_comments</div>
   <form class="search navbar-right" role="search">
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>package test_package</h5>
+    <h5>test_package package</h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
@@ -54,6 +54,7 @@ <h5>package test_package</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>code_in_comments library</h1>
 
     <section class="desc markdown">
       <pre class="language-dart"><code class="language-dart">void main() {
@@ -77,7 +78,7 @@ <h5>package test_package</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>library code_in_comments</h5>
+    <h5>code_in_comments library</h5>
     <ol>
     
     
diff --git a/testing/test_package_docs/css/css-library.html b/testing/test_package_docs/css/css-library.html
index 715a19926c..6c96dbd99a 100644
--- a/testing/test_package_docs/css/css-library.html
+++ b/testing/test_package_docs/css/css-library.html
@@ -24,7 +24,7 @@
   <button id="sidenav-left-toggle" type="button">&nbsp;</button>
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
-    <li class="self-crumb">library css</li>
+    <li class="self-crumb">css library</li>
   </ol>
   <div class="self-name">css</div>
   <form class="search navbar-right" role="search">
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>package test_package</h5>
+    <h5>test_package package</h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
@@ -54,6 +54,7 @@ <h5>package test_package</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>css library</h1>
 
     <section class="desc markdown">
       <p>Testing that a library name doesn't conflict
@@ -84,7 +85,7 @@ <h2>Properties</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>library css</h5>
+    <h5>css library</h5>
     <ol>
     
     
diff --git a/testing/test_package_docs/css/theOnlyThingInTheLibrary.html b/testing/test_package_docs/css/theOnlyThingInTheLibrary.html
index b1cf684cf6..8345fe5260 100644
--- a/testing/test_package_docs/css/theOnlyThingInTheLibrary.html
+++ b/testing/test_package_docs/css/theOnlyThingInTheLibrary.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="css/css-library.html">css</a></li>
-    <li class="self-crumb">property theOnlyThingInTheLibrary</li>
+    <li class="self-crumb">theOnlyThingInTheLibrary property</li>
   </ol>
   <div class="self-name">theOnlyThingInTheLibrary</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library css</h5>
+    <h5>css library</h5>
     <ol>
     
     
@@ -50,6 +50,8 @@ <h5>library css</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>theOnlyThingInTheLibrary top-level property</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">theOnlyThingInTheLibrary</span>      <div class="features">read / write</div>
@@ -60,7 +62,6 @@ <h5>library css</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property theOnlyThingInTheLibrary</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Animal-class.html b/testing/test_package_docs/ex/Animal-class.html
index 298206ea62..2d1b1e4652 100644
--- a/testing/test_package_docs/ex/Animal-class.html
+++ b/testing/test_package_docs/ex/Animal-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">enum Animal</li>
+    <li class="self-crumb">Animal enum</li>
   </ol>
   <div class="self-name">Animal</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Animal enum</h1>
 
     <section class="desc markdown">
       <p>Referencing <a href="ex/processMessage.html">processMessage</a> (or other things) here should not break
@@ -242,7 +243,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>enum Animal</h5>
     <ol>
       <li class="section-title"><a href="ex/Animal-class.html#constants">Constants</a></li>
       <li>CAT</li>
diff --git a/testing/test_package_docs/ex/Animal/hashCode.html b/testing/test_package_docs/ex/Animal/hashCode.html
index 192bc2ff53..d68f04d0e4 100644
--- a/testing/test_package_docs/ex/Animal/hashCode.html
+++ b/testing/test_package_docs/ex/Animal/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Animal-class.html">Animal</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>enum Animal</h5>
+    <h5>Animal enum</h5>
     <ol>
     
       <li class="section-title">
@@ -65,6 +65,8 @@ <h5>enum Animal</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -79,7 +81,6 @@ <h5>enum Animal</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Animal/noSuchMethod.html b/testing/test_package_docs/ex/Animal/noSuchMethod.html
index 854a48b159..ee2f7d88f4 100644
--- a/testing/test_package_docs/ex/Animal/noSuchMethod.html
+++ b/testing/test_package_docs/ex/Animal/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Animal-class.html">Animal</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>enum Animal</h5>
+    <h5>Animal enum</h5>
     <ol>
     
       <li class="section-title">
@@ -65,6 +65,8 @@ <h5>enum Animal</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -75,7 +77,6 @@ <h5>enum Animal</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Animal/operator_equals.html b/testing/test_package_docs/ex/Animal/operator_equals.html
index 2fff46c989..63cbbd81d9 100644
--- a/testing/test_package_docs/ex/Animal/operator_equals.html
+++ b/testing/test_package_docs/ex/Animal/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Animal-class.html">Animal</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>enum Animal</h5>
+    <h5>Animal enum</h5>
     <ol>
     
       <li class="section-title">
@@ -65,6 +65,8 @@ <h5>enum Animal</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -75,7 +77,6 @@ <h5>enum Animal</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Animal/runtimeType.html b/testing/test_package_docs/ex/Animal/runtimeType.html
index 866fa30adf..0c65757f00 100644
--- a/testing/test_package_docs/ex/Animal/runtimeType.html
+++ b/testing/test_package_docs/ex/Animal/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Animal-class.html">Animal</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>enum Animal</h5>
+    <h5>Animal enum</h5>
     <ol>
     
       <li class="section-title">
@@ -65,6 +65,8 @@ <h5>enum Animal</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -79,7 +81,6 @@ <h5>enum Animal</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Animal/toString.html b/testing/test_package_docs/ex/Animal/toString.html
index 26e6d6afe5..cec2efe902 100644
--- a/testing/test_package_docs/ex/Animal/toString.html
+++ b/testing/test_package_docs/ex/Animal/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Animal-class.html">Animal</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>enum Animal</h5>
+    <h5>Animal enum</h5>
     <ol>
     
       <li class="section-title">
@@ -65,6 +65,8 @@ <h5>enum Animal</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -75,7 +77,6 @@ <h5>enum Animal</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass-class.html b/testing/test_package_docs/ex/AnotherParameterizedClass-class.html
index cb5faee1f5..3d538dc8f7 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass-class.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class AnotherParameterizedClass<span class="signature">&lt;B&gt;</span></li>
+    <li class="self-crumb">AnotherParameterizedClass<span class="signature">&lt;B&gt;</span> class</li>
   </ol>
   <div class="self-name">AnotherParameterizedClass</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>AnotherParameterizedClass&lt;B&gt; class</h1>
 
     
 
@@ -191,7 +192,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class AnotherParameterizedClass</h5>
     <ol>
       <li class="section-title"><a href="ex/AnotherParameterizedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/AnotherParameterizedClass/AnotherParameterizedClass.html">AnotherParameterizedClass</a></li>
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass/AnotherParameterizedClass.html b/testing/test_package_docs/ex/AnotherParameterizedClass/AnotherParameterizedClass.html
index 7cf367104e..eddc05e197 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass/AnotherParameterizedClass.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass/AnotherParameterizedClass.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;B&gt;</span></a></li>
-    <li class="self-crumb">constructor AnotherParameterizedClass</li>
+    <li class="self-crumb">AnotherParameterizedClass constructor</li>
   </ol>
   <div class="self-name">AnotherParameterizedClass</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AnotherParameterizedClass</h5>
+    <h5>AnotherParameterizedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/AnotherParameterizedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/AnotherParameterizedClass/AnotherParameterizedClass.html">AnotherParameterizedClass</a></li>
@@ -61,6 +61,8 @@ <h5>class AnotherParameterizedClass</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>AnotherParameterizedClass&lt;B&gt; constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">AnotherParameterizedClass&lt;B&gt;</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class AnotherParameterizedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor AnotherParameterizedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass/hashCode.html b/testing/test_package_docs/ex/AnotherParameterizedClass/hashCode.html
index e22795b767..d2b7061156 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass/hashCode.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;B&gt;</span></a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AnotherParameterizedClass</h5>
+    <h5>AnotherParameterizedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/AnotherParameterizedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/AnotherParameterizedClass/AnotherParameterizedClass.html">AnotherParameterizedClass</a></li>
@@ -61,6 +61,8 @@ <h5>class AnotherParameterizedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class AnotherParameterizedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass/noSuchMethod.html b/testing/test_package_docs/ex/AnotherParameterizedClass/noSuchMethod.html
index 574ea88b2d..9a7abb4782 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass/noSuchMethod.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;B&gt;</span></a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AnotherParameterizedClass</h5>
+    <h5>AnotherParameterizedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/AnotherParameterizedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/AnotherParameterizedClass/AnotherParameterizedClass.html">AnotherParameterizedClass</a></li>
@@ -61,6 +61,8 @@ <h5>class AnotherParameterizedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -71,7 +73,6 @@ <h5>class AnotherParameterizedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass/operator_equals.html b/testing/test_package_docs/ex/AnotherParameterizedClass/operator_equals.html
index 7e63c520d3..e23d47fba2 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass/operator_equals.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;B&gt;</span></a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AnotherParameterizedClass</h5>
+    <h5>AnotherParameterizedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/AnotherParameterizedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/AnotherParameterizedClass/AnotherParameterizedClass.html">AnotherParameterizedClass</a></li>
@@ -61,6 +61,8 @@ <h5>class AnotherParameterizedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -71,7 +73,6 @@ <h5>class AnotherParameterizedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass/runtimeType.html b/testing/test_package_docs/ex/AnotherParameterizedClass/runtimeType.html
index b99c520767..4587c4baa5 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass/runtimeType.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;B&gt;</span></a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AnotherParameterizedClass</h5>
+    <h5>AnotherParameterizedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/AnotherParameterizedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/AnotherParameterizedClass/AnotherParameterizedClass.html">AnotherParameterizedClass</a></li>
@@ -61,6 +61,8 @@ <h5>class AnotherParameterizedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class AnotherParameterizedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass/toString.html b/testing/test_package_docs/ex/AnotherParameterizedClass/toString.html
index d0c7651240..2a68a1b1e4 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass/toString.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;B&gt;</span></a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AnotherParameterizedClass</h5>
+    <h5>AnotherParameterizedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/AnotherParameterizedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/AnotherParameterizedClass/AnotherParameterizedClass.html">AnotherParameterizedClass</a></li>
@@ -61,6 +61,8 @@ <h5>class AnotherParameterizedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -71,7 +73,6 @@ <h5>class AnotherParameterizedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Apple-class.html b/testing/test_package_docs/ex/Apple-class.html
index 219b0bcf6f..9268e96b1c 100644
--- a/testing/test_package_docs/ex/Apple-class.html
+++ b/testing/test_package_docs/ex/Apple-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class Apple</li>
+    <li class="self-crumb">Apple class</li>
   </ol>
   <div class="self-name">Apple</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Apple class</h1>
 
     <section class="desc markdown">
       <p>Sample class <code>String</code></p><pre class="language-dart">  A
@@ -333,7 +334,6 @@ <h2>Constants</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class Apple</h5>
     <ol>
       <li class="section-title"><a href="ex/Apple-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Apple/Apple.html">Apple</a></li>
diff --git a/testing/test_package_docs/ex/Apple/Apple.fromString.html b/testing/test_package_docs/ex/Apple/Apple.fromString.html
index 969dc4741f..51434f11ce 100644
--- a/testing/test_package_docs/ex/Apple/Apple.fromString.html
+++ b/testing/test_package_docs/ex/Apple/Apple.fromString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Apple-class.html">Apple</a></li>
-    <li class="self-crumb">factory constructor Apple.fromString</li>
+    <li class="self-crumb">Apple.fromString factory constructor</li>
   </ol>
   <div class="self-name">Apple.fromString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Apple</h5>
+    <h5>Apple class</h5>
     <ol>
       <li class="section-title"><a href="ex/Apple-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Apple/Apple.html">Apple</a></li>
@@ -76,6 +76,8 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Apple.fromString constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">Apple.fromString</span>(<wbr><span class="parameter" id="fromString-param-s"><span class="type-annotation">String</span> <span class="parameter-name">s</span></span>)
@@ -87,7 +89,6 @@ <h5>class Apple</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor Apple.fromString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Apple/Apple.html b/testing/test_package_docs/ex/Apple/Apple.html
index 6963f4e016..2a5d41d7a5 100644
--- a/testing/test_package_docs/ex/Apple/Apple.html
+++ b/testing/test_package_docs/ex/Apple/Apple.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Apple-class.html">Apple</a></li>
-    <li class="self-crumb">constructor Apple</li>
+    <li class="self-crumb">Apple constructor</li>
   </ol>
   <div class="self-name">Apple</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Apple</h5>
+    <h5>Apple class</h5>
     <ol>
       <li class="section-title"><a href="ex/Apple-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Apple/Apple.html">Apple</a></li>
@@ -76,6 +76,8 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Apple constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">Apple</span>(<wbr>)
@@ -90,7 +92,6 @@ <h5>class Apple</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor Apple</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Apple/fieldWithTypedef.html b/testing/test_package_docs/ex/Apple/fieldWithTypedef.html
index 1645743235..91835f3132 100644
--- a/testing/test_package_docs/ex/Apple/fieldWithTypedef.html
+++ b/testing/test_package_docs/ex/Apple/fieldWithTypedef.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Apple-class.html">Apple</a></li>
-    <li class="self-crumb">property fieldWithTypedef</li>
+    <li class="self-crumb">fieldWithTypedef property</li>
   </ol>
   <div class="self-name">fieldWithTypedef</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Apple</h5>
+    <h5>Apple class</h5>
     <ol>
       <li class="section-title"><a href="ex/Apple-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Apple/Apple.html">Apple</a></li>
@@ -76,6 +76,8 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>fieldWithTypedef property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;bool&gt;</span></span>
           <span class="name ">fieldWithTypedef</span>          <div class="features">final</div>
@@ -88,7 +90,6 @@ <h5>class Apple</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property fieldWithTypedef</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Apple/hashCode.html b/testing/test_package_docs/ex/Apple/hashCode.html
index 253dc5e949..b28e347393 100644
--- a/testing/test_package_docs/ex/Apple/hashCode.html
+++ b/testing/test_package_docs/ex/Apple/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Apple-class.html">Apple</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Apple</h5>
+    <h5>Apple class</h5>
     <ol>
       <li class="section-title"><a href="ex/Apple-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Apple/Apple.html">Apple</a></li>
@@ -76,6 +76,8 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -90,7 +92,6 @@ <h5>class Apple</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Apple/isGreaterThan.html b/testing/test_package_docs/ex/Apple/isGreaterThan.html
index 231c812d9b..f6b0305de1 100644
--- a/testing/test_package_docs/ex/Apple/isGreaterThan.html
+++ b/testing/test_package_docs/ex/Apple/isGreaterThan.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Apple-class.html">Apple</a></li>
-    <li class="self-crumb">method isGreaterThan</li>
+    <li class="self-crumb">isGreaterThan method</li>
   </ol>
   <div class="self-name">isGreaterThan</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Apple</h5>
+    <h5>Apple class</h5>
     <ol>
       <li class="section-title"><a href="ex/Apple-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Apple/Apple.html">Apple</a></li>
@@ -76,6 +76,8 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>isGreaterThan method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">isGreaterThan</span>(<wbr><span class="parameter" id="isGreaterThan-param-number"><span class="type-annotation">int</span> <span class="parameter-name">number</span>, {</span> <span class="parameter" id="isGreaterThan-param-check"><span class="type-annotation">int</span> <span class="parameter-name">check</span>: <span class="default-value">5</span></span> })
@@ -86,7 +88,6 @@ <h5>class Apple</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method isGreaterThan</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Apple/m.html b/testing/test_package_docs/ex/Apple/m.html
index 047642490c..837297eb56 100644
--- a/testing/test_package_docs/ex/Apple/m.html
+++ b/testing/test_package_docs/ex/Apple/m.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Apple-class.html">Apple</a></li>
-    <li class="self-crumb">property m</li>
+    <li class="self-crumb">m property</li>
   </ol>
   <div class="self-name">m</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Apple</h5>
+    <h5>Apple class</h5>
     <ol>
       <li class="section-title"><a href="ex/Apple-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Apple/Apple.html">Apple</a></li>
@@ -76,6 +76,8 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>m property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">int</span>
           <span class="name ">m</span>          <div class="features">read / write</div>
@@ -88,7 +90,6 @@ <h5>class Apple</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property m</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Apple/m1.html b/testing/test_package_docs/ex/Apple/m1.html
index 236f739b81..4d93a6f0b7 100644
--- a/testing/test_package_docs/ex/Apple/m1.html
+++ b/testing/test_package_docs/ex/Apple/m1.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Apple-class.html">Apple</a></li>
-    <li class="self-crumb">method m1</li>
+    <li class="self-crumb">m1 method</li>
   </ol>
   <div class="self-name">m1</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Apple</h5>
+    <h5>Apple class</h5>
     <ol>
       <li class="section-title"><a href="ex/Apple-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Apple/Apple.html">Apple</a></li>
@@ -76,6 +76,8 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>m1 method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">m1</span>(<wbr>)
@@ -91,7 +93,6 @@ <h5>class Apple</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method m1</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Apple/methodWithTypedefParam.html b/testing/test_package_docs/ex/Apple/methodWithTypedefParam.html
index 5948c257cc..a654ff4da4 100644
--- a/testing/test_package_docs/ex/Apple/methodWithTypedefParam.html
+++ b/testing/test_package_docs/ex/Apple/methodWithTypedefParam.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Apple-class.html">Apple</a></li>
-    <li class="self-crumb">method methodWithTypedefParam</li>
+    <li class="self-crumb">methodWithTypedefParam method</li>
   </ol>
   <div class="self-name">methodWithTypedefParam</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Apple</h5>
+    <h5>Apple class</h5>
     <ol>
       <li class="section-title"><a href="ex/Apple-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Apple/Apple.html">Apple</a></li>
@@ -76,6 +76,8 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>methodWithTypedefParam method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">methodWithTypedefParam</span>(<wbr><span class="parameter" id="methodWithTypedefParam-param-p"><span class="type-annotation"><a href="ex/processMessage.html">processMessage</a></span> <span class="parameter-name">p</span></span>)
@@ -86,7 +88,6 @@ <h5>class Apple</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method methodWithTypedefParam</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Apple/n-constant.html b/testing/test_package_docs/ex/Apple/n-constant.html
index b805f2ae7c..401fe8fb5c 100644
--- a/testing/test_package_docs/ex/Apple/n-constant.html
+++ b/testing/test_package_docs/ex/Apple/n-constant.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Apple-class.html">Apple</a></li>
-    <li class="self-crumb">constant n</li>
+    <li class="self-crumb">n constant</li>
   </ol>
   <div class="self-name">n</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Apple</h5>
+    <h5>Apple class</h5>
     <ol>
       <li class="section-title"><a href="ex/Apple-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Apple/Apple.html">Apple</a></li>
@@ -76,6 +76,7 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>n property</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">int</span>
@@ -88,7 +89,6 @@ <h5>class Apple</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property n</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Apple/noSuchMethod.html b/testing/test_package_docs/ex/Apple/noSuchMethod.html
index acd31703df..1e87d4b01d 100644
--- a/testing/test_package_docs/ex/Apple/noSuchMethod.html
+++ b/testing/test_package_docs/ex/Apple/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Apple-class.html">Apple</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Apple</h5>
+    <h5>Apple class</h5>
     <ol>
       <li class="section-title"><a href="ex/Apple-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Apple/Apple.html">Apple</a></li>
@@ -76,6 +76,8 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -86,7 +88,6 @@ <h5>class Apple</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Apple/operator_equals.html b/testing/test_package_docs/ex/Apple/operator_equals.html
index 90a5d329f3..7952a66711 100644
--- a/testing/test_package_docs/ex/Apple/operator_equals.html
+++ b/testing/test_package_docs/ex/Apple/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Apple-class.html">Apple</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Apple</h5>
+    <h5>Apple class</h5>
     <ol>
       <li class="section-title"><a href="ex/Apple-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Apple/Apple.html">Apple</a></li>
@@ -76,6 +76,8 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -86,7 +88,6 @@ <h5>class Apple</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Apple/operator_multiply.html b/testing/test_package_docs/ex/Apple/operator_multiply.html
index f195fe1592..794d96964b 100644
--- a/testing/test_package_docs/ex/Apple/operator_multiply.html
+++ b/testing/test_package_docs/ex/Apple/operator_multiply.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Apple-class.html">Apple</a></li>
-    <li class="self-crumb">method operator *</li>
+    <li class="self-crumb">operator * method</li>
   </ol>
   <div class="self-name">operator *</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Apple</h5>
+    <h5>Apple class</h5>
     <ol>
       <li class="section-title"><a href="ex/Apple-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Apple/Apple.html">Apple</a></li>
@@ -76,6 +76,8 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator * method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">operator *</span>(<wbr><span class="parameter" id="*-param-other"><span class="type-annotation"><a href="ex/Apple-class.html">Apple</a></span> <span class="parameter-name">other</span></span>)
@@ -86,7 +88,6 @@ <h5>class Apple</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator *</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Apple/paramFromExportLib.html b/testing/test_package_docs/ex/Apple/paramFromExportLib.html
index 7f61476bbb..e3685d0134 100644
--- a/testing/test_package_docs/ex/Apple/paramFromExportLib.html
+++ b/testing/test_package_docs/ex/Apple/paramFromExportLib.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Apple-class.html">Apple</a></li>
-    <li class="self-crumb">method paramFromExportLib</li>
+    <li class="self-crumb">paramFromExportLib method</li>
   </ol>
   <div class="self-name">paramFromExportLib</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Apple</h5>
+    <h5>Apple class</h5>
     <ol>
       <li class="section-title"><a href="ex/Apple-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Apple/Apple.html">Apple</a></li>
@@ -76,6 +76,8 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>paramFromExportLib method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">paramFromExportLib</span>(<wbr><span class="parameter" id="paramFromExportLib-param-helper"><span class="type-annotation"><a href="ex/Helper-class.html">Helper</a></span> <span class="parameter-name">helper</span></span>)
@@ -86,7 +88,6 @@ <h5>class Apple</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method paramFromExportLib</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Apple/printMsg.html b/testing/test_package_docs/ex/Apple/printMsg.html
index 00ded940d6..bfae083ce7 100644
--- a/testing/test_package_docs/ex/Apple/printMsg.html
+++ b/testing/test_package_docs/ex/Apple/printMsg.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Apple-class.html">Apple</a></li>
-    <li class="self-crumb">method printMsg</li>
+    <li class="self-crumb">printMsg method</li>
   </ol>
   <div class="self-name">printMsg</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Apple</h5>
+    <h5>Apple class</h5>
     <ol>
       <li class="section-title"><a href="ex/Apple-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Apple/Apple.html">Apple</a></li>
@@ -76,6 +76,8 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>printMsg method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">printMsg</span>(<wbr><span class="parameter" id="printMsg-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span>, [</span> <span class="parameter" id="printMsg-param-linebreak"><span class="type-annotation">bool</span> <span class="parameter-name">linebreak</span></span> ])
@@ -86,7 +88,6 @@ <h5>class Apple</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method printMsg</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Apple/runtimeType.html b/testing/test_package_docs/ex/Apple/runtimeType.html
index 5b7b603680..5db1e11696 100644
--- a/testing/test_package_docs/ex/Apple/runtimeType.html
+++ b/testing/test_package_docs/ex/Apple/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Apple-class.html">Apple</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Apple</h5>
+    <h5>Apple class</h5>
     <ol>
       <li class="section-title"><a href="ex/Apple-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Apple/Apple.html">Apple</a></li>
@@ -76,6 +76,8 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -90,7 +92,6 @@ <h5>class Apple</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Apple/s.html b/testing/test_package_docs/ex/Apple/s.html
index 8335240ecf..502db70dc9 100644
--- a/testing/test_package_docs/ex/Apple/s.html
+++ b/testing/test_package_docs/ex/Apple/s.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Apple-class.html">Apple</a></li>
-    <li class="self-crumb">property s</li>
+    <li class="self-crumb">s property</li>
   </ol>
   <div class="self-name">s</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Apple</h5>
+    <h5>Apple class</h5>
     <ol>
       <li class="section-title"><a href="ex/Apple-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Apple/Apple.html">Apple</a></li>
@@ -76,6 +76,8 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>s property</h1>
+
 
         <section id="getter">
         
@@ -106,7 +108,6 @@ <h5>class Apple</h5>
           </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property s</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Apple/string.html b/testing/test_package_docs/ex/Apple/string.html
index 2c3f092d3f..bef85cd9cf 100644
--- a/testing/test_package_docs/ex/Apple/string.html
+++ b/testing/test_package_docs/ex/Apple/string.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Apple-class.html">Apple</a></li>
-    <li class="self-crumb">property string</li>
+    <li class="self-crumb">string property</li>
   </ol>
   <div class="self-name">string</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Apple</h5>
+    <h5>Apple class</h5>
     <ol>
       <li class="section-title"><a href="ex/Apple-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Apple/Apple.html">Apple</a></li>
@@ -76,6 +76,8 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>string property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">String</span>
           <span class="name ">string</span>          <div class="features">read / write</div>
@@ -85,7 +87,6 @@ <h5>class Apple</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property string</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Apple/toString.html b/testing/test_package_docs/ex/Apple/toString.html
index 69519cbb97..b0fc3f96b4 100644
--- a/testing/test_package_docs/ex/Apple/toString.html
+++ b/testing/test_package_docs/ex/Apple/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Apple-class.html">Apple</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Apple</h5>
+    <h5>Apple class</h5>
     <ol>
       <li class="section-title"><a href="ex/Apple-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Apple/Apple.html">Apple</a></li>
@@ -76,6 +76,8 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -86,7 +88,6 @@ <h5>class Apple</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Apple/whataclass.html b/testing/test_package_docs/ex/Apple/whataclass.html
index 0716b8d322..5ffc711a9a 100644
--- a/testing/test_package_docs/ex/Apple/whataclass.html
+++ b/testing/test_package_docs/ex/Apple/whataclass.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Apple-class.html">Apple</a></li>
-    <li class="self-crumb">method whataclass</li>
+    <li class="self-crumb">whataclass method</li>
   </ol>
   <div class="self-name">whataclass</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Apple</h5>
+    <h5>Apple class</h5>
     <ol>
       <li class="section-title"><a href="ex/Apple-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Apple/Apple.html">Apple</a></li>
@@ -76,6 +76,8 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>whataclass method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">whataclass</span>(<wbr><span class="parameter" id="whataclass-param-list"><span class="type-annotation">List<span class="signature">&lt;<a href="test_package_imported.main/Whataclass-class.html">Whataclass</a><span class="signature">&lt;bool&gt;</span>&gt;</span></span> <span class="parameter-name">list</span></span>)
@@ -89,7 +91,6 @@ <h5>class Apple</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method whataclass</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/B-class.html b/testing/test_package_docs/ex/B-class.html
index a864a7ebed..2c77cd9358 100644
--- a/testing/test_package_docs/ex/B-class.html
+++ b/testing/test_package_docs/ex/B-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class B</li>
+    <li class="self-crumb">B class</li>
   </ol>
   <div class="self-name">B</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>B class</h1>
 
     <section class="desc markdown">
       <p>Extends class <a href="ex/Apple-class.html">Apple</a>, use <a href="ex/Apple/Apple.html">new Apple</a> or <a href="ex/Apple/Apple.fromString.html">new Apple.fromString</a></p><pre class="language-dart"> B extends A
@@ -353,7 +354,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class B</h5>
     <ol>
       <li class="section-title"><a href="ex/B-class.html#constructors">Constructors</a></li>
       <li><a href="ex/B/B.html">B</a></li>
diff --git a/testing/test_package_docs/ex/B/B.html b/testing/test_package_docs/ex/B/B.html
index 766882bbdd..68a6e3d792 100644
--- a/testing/test_package_docs/ex/B/B.html
+++ b/testing/test_package_docs/ex/B/B.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/B-class.html">B</a></li>
-    <li class="self-crumb">constructor B</li>
+    <li class="self-crumb">B constructor</li>
   </ol>
   <div class="self-name">B</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class B</h5>
+    <h5>B class</h5>
     <ol>
       <li class="section-title"><a href="ex/B-class.html#constructors">Constructors</a></li>
       <li><a href="ex/B/B.html">B</a></li>
@@ -77,6 +77,8 @@ <h5>class B</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>B constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">B</span>(<wbr>)
@@ -88,7 +90,6 @@ <h5>class B</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor B</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/B/abstractMethod.html b/testing/test_package_docs/ex/B/abstractMethod.html
index 91f73d708e..62c1f59e44 100644
--- a/testing/test_package_docs/ex/B/abstractMethod.html
+++ b/testing/test_package_docs/ex/B/abstractMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/B-class.html">B</a></li>
-    <li class="self-crumb">method abstractMethod</li>
+    <li class="self-crumb">abstractMethod method</li>
   </ol>
   <div class="self-name">abstractMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class B</h5>
+    <h5>B class</h5>
     <ol>
       <li class="section-title"><a href="ex/B-class.html#constructors">Constructors</a></li>
       <li><a href="ex/B/B.html">B</a></li>
@@ -77,6 +77,8 @@ <h5>class B</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>abstractMethod method</h1>
+
     <section class="multi-line-signature">
       <div>
         <ol class="annotation-list">
@@ -92,7 +94,6 @@ <h5>class B</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method abstractMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/B/autoCompress.html b/testing/test_package_docs/ex/B/autoCompress.html
index 9633956601..02d9bd883f 100644
--- a/testing/test_package_docs/ex/B/autoCompress.html
+++ b/testing/test_package_docs/ex/B/autoCompress.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/B-class.html">B</a></li>
-    <li class="self-crumb">property autoCompress</li>
+    <li class="self-crumb">autoCompress property</li>
   </ol>
   <div class="self-name">autoCompress</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class B</h5>
+    <h5>B class</h5>
     <ol>
       <li class="section-title"><a href="ex/B-class.html#constructors">Constructors</a></li>
       <li><a href="ex/B/B.html">B</a></li>
@@ -77,6 +77,8 @@ <h5>class B</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>autoCompress property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">bool</span>
           <span class="name ">autoCompress</span>          <div class="features">read / write</div>
@@ -90,7 +92,6 @@ <h5>class B</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property autoCompress</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/B/doNothing.html b/testing/test_package_docs/ex/B/doNothing.html
index 61fb916834..9c5b622392 100644
--- a/testing/test_package_docs/ex/B/doNothing.html
+++ b/testing/test_package_docs/ex/B/doNothing.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/B-class.html">B</a></li>
-    <li class="self-crumb">method <span class="deprecated">doNothing</span></li>
+    <li class="self-crumb"><span class="deprecated">doNothing</span> method</li>
   </ol>
   <div class="self-name">doNothing</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class B</h5>
+    <h5>B class</h5>
     <ol>
       <li class="section-title"><a href="ex/B-class.html#constructors">Constructors</a></li>
       <li><a href="ex/B/B.html">B</a></li>
@@ -77,6 +77,8 @@ <h5>class B</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>doNothing method</h1>
+
     <section class="multi-line-signature">
       <div>
         <ol class="annotation-list">
@@ -92,7 +94,6 @@ <h5>class B</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method doNothing</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/B/isImplemented.html b/testing/test_package_docs/ex/B/isImplemented.html
index 3a61c752f1..0cd256f7be 100644
--- a/testing/test_package_docs/ex/B/isImplemented.html
+++ b/testing/test_package_docs/ex/B/isImplemented.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/B-class.html">B</a></li>
-    <li class="self-crumb">property isImplemented</li>
+    <li class="self-crumb">isImplemented property</li>
   </ol>
   <div class="self-name">isImplemented</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class B</h5>
+    <h5>B class</h5>
     <ol>
       <li class="section-title"><a href="ex/B-class.html#constructors">Constructors</a></li>
       <li><a href="ex/B/B.html">B</a></li>
@@ -77,6 +77,8 @@ <h5>class B</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>isImplemented property</h1>
+
 
         <section id="getter">
         
@@ -91,7 +93,6 @@ <h5>class B</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property isImplemented</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/B/list.html b/testing/test_package_docs/ex/B/list.html
index 7441f56c30..434deeac6b 100644
--- a/testing/test_package_docs/ex/B/list.html
+++ b/testing/test_package_docs/ex/B/list.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/B-class.html">B</a></li>
-    <li class="self-crumb">property list</li>
+    <li class="self-crumb">list property</li>
   </ol>
   <div class="self-name">list</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class B</h5>
+    <h5>B class</h5>
     <ol>
       <li class="section-title"><a href="ex/B-class.html#constructors">Constructors</a></li>
       <li><a href="ex/B/B.html">B</a></li>
@@ -77,6 +77,8 @@ <h5>class B</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>list property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">List<span class="signature">&lt;String&gt;</span></span>
           <span class="name ">list</span>          <div class="features">read / write</div>
@@ -89,7 +91,6 @@ <h5>class B</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property list</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/B/m1.html b/testing/test_package_docs/ex/B/m1.html
index 6dd6236e88..1456d46933 100644
--- a/testing/test_package_docs/ex/B/m1.html
+++ b/testing/test_package_docs/ex/B/m1.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/B-class.html">B</a></li>
-    <li class="self-crumb">method m1</li>
+    <li class="self-crumb">m1 method</li>
   </ol>
   <div class="self-name">m1</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class B</h5>
+    <h5>B class</h5>
     <ol>
       <li class="section-title"><a href="ex/B-class.html#constructors">Constructors</a></li>
       <li><a href="ex/B/B.html">B</a></li>
@@ -77,6 +77,8 @@ <h5>class B</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>m1 method</h1>
+
     <section class="multi-line-signature">
       <div>
         <ol class="annotation-list">
@@ -97,7 +99,6 @@ <h5>class B</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method m1</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/B/s.html b/testing/test_package_docs/ex/B/s.html
index 5ec4a3563c..96212e919c 100644
--- a/testing/test_package_docs/ex/B/s.html
+++ b/testing/test_package_docs/ex/B/s.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/B-class.html">B</a></li>
-    <li class="self-crumb">property s</li>
+    <li class="self-crumb">s property</li>
   </ol>
   <div class="self-name">s</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class B</h5>
+    <h5>B class</h5>
     <ol>
       <li class="section-title"><a href="ex/B-class.html#constructors">Constructors</a></li>
       <li><a href="ex/B/B.html">B</a></li>
@@ -77,6 +77,8 @@ <h5>class B</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>s property</h1>
+
 
         <section id="getter">
         
@@ -107,7 +109,6 @@ <h5>class B</h5>
           </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property s</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/B/writeMsg.html b/testing/test_package_docs/ex/B/writeMsg.html
index 5d7c43d011..a098f370bc 100644
--- a/testing/test_package_docs/ex/B/writeMsg.html
+++ b/testing/test_package_docs/ex/B/writeMsg.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/B-class.html">B</a></li>
-    <li class="self-crumb">method writeMsg</li>
+    <li class="self-crumb">writeMsg method</li>
   </ol>
   <div class="self-name">writeMsg</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class B</h5>
+    <h5>B class</h5>
     <ol>
       <li class="section-title"><a href="ex/B-class.html#constructors">Constructors</a></li>
       <li><a href="ex/B/B.html">B</a></li>
@@ -77,6 +77,8 @@ <h5>class B</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>writeMsg method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">writeMsg</span>(<wbr><span class="parameter" id="writeMsg-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span>, [</span> <span class="parameter" id="writeMsg-param-transformMsg"><span class="type-annotation">String</span> <span class="parameter-name">transformMsg</span>(<span class="parameter" id="transformMsg-param-origMsg"><span class="type-annotation">String</span> <span class="parameter-name">origMsg</span>, </span> <span class="parameter" id="transformMsg-param-flag"><span class="type-annotation">bool</span> <span class="parameter-name">flag</span></span>)</span> ])
@@ -87,7 +89,6 @@ <h5>class B</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method writeMsg</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/COLOR-constant.html b/testing/test_package_docs/ex/COLOR-constant.html
index 80fae57a6a..ab80aa2373 100644
--- a/testing/test_package_docs/ex/COLOR-constant.html
+++ b/testing/test_package_docs/ex/COLOR-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">constant COLOR</li>
+    <li class="self-crumb">COLOR constant</li>
   </ol>
   <div class="self-name">COLOR</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>COLOR top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name ">COLOR</span>      =
@@ -119,7 +120,6 @@ <h5>library ex</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property COLOR</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/COLOR_GREEN-constant.html b/testing/test_package_docs/ex/COLOR_GREEN-constant.html
index 81dfa293bf..c4dffbc4e2 100644
--- a/testing/test_package_docs/ex/COLOR_GREEN-constant.html
+++ b/testing/test_package_docs/ex/COLOR_GREEN-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">constant COLOR_GREEN</li>
+    <li class="self-crumb">COLOR_GREEN constant</li>
   </ol>
   <div class="self-name">COLOR_GREEN</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>COLOR_GREEN top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name ">COLOR_GREEN</span>      =
@@ -119,7 +120,6 @@ <h5>library ex</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property COLOR_GREEN</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/COLOR_ORANGE-constant.html b/testing/test_package_docs/ex/COLOR_ORANGE-constant.html
index 40be29a73b..5e72ba47b2 100644
--- a/testing/test_package_docs/ex/COLOR_ORANGE-constant.html
+++ b/testing/test_package_docs/ex/COLOR_ORANGE-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">constant COLOR_ORANGE</li>
+    <li class="self-crumb">COLOR_ORANGE constant</li>
   </ol>
   <div class="self-name">COLOR_ORANGE</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>COLOR_ORANGE top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name ">COLOR_ORANGE</span>      =
@@ -119,7 +120,6 @@ <h5>library ex</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property COLOR_ORANGE</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html b/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html
index 4594b80fc1..b3bc20b830 100644
--- a/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html
+++ b/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">constant COMPLEX_COLOR</li>
+    <li class="self-crumb">COMPLEX_COLOR constant</li>
   </ol>
   <div class="self-name">COMPLEX_COLOR</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>COMPLEX_COLOR top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name ">COMPLEX_COLOR</span>      =
@@ -119,7 +120,6 @@ <h5>library ex</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property COMPLEX_COLOR</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Cat-class.html b/testing/test_package_docs/ex/Cat-class.html
index a09c6b645c..e11fb252c8 100644
--- a/testing/test_package_docs/ex/Cat-class.html
+++ b/testing/test_package_docs/ex/Cat-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">abstract class Cat</li>
+    <li class="self-crumb">Cat abstract class</li>
   </ol>
   <div class="self-name">Cat</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Cat class</h1>
 
     
     <section>
@@ -222,7 +223,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class Cat</h5>
     <ol>
       <li class="section-title"><a href="ex/Cat-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Cat/Cat.html">Cat</a></li>
diff --git a/testing/test_package_docs/ex/Cat/Cat.html b/testing/test_package_docs/ex/Cat/Cat.html
index 88d3eb5c01..dfda26ca26 100644
--- a/testing/test_package_docs/ex/Cat/Cat.html
+++ b/testing/test_package_docs/ex/Cat/Cat.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Cat-class.html">Cat</a></li>
-    <li class="self-crumb">constructor Cat</li>
+    <li class="self-crumb">Cat constructor</li>
   </ol>
   <div class="self-name">Cat</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Cat</h5>
+    <h5>Cat class</h5>
     <ol>
       <li class="section-title"><a href="ex/Cat-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Cat/Cat.html">Cat</a></li>
@@ -63,6 +63,8 @@ <h5>class Cat</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Cat constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">Cat</span>(<wbr>)
@@ -74,7 +76,6 @@ <h5>class Cat</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor Cat</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Cat/abstractMethod.html b/testing/test_package_docs/ex/Cat/abstractMethod.html
index 3fe69fa429..5594000aea 100644
--- a/testing/test_package_docs/ex/Cat/abstractMethod.html
+++ b/testing/test_package_docs/ex/Cat/abstractMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Cat-class.html">Cat</a></li>
-    <li class="self-crumb">abstract method abstractMethod</li>
+    <li class="self-crumb">abstractMethod abstract method</li>
   </ol>
   <div class="self-name">abstractMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Cat</h5>
+    <h5>Cat class</h5>
     <ol>
       <li class="section-title"><a href="ex/Cat-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Cat/Cat.html">Cat</a></li>
@@ -63,6 +63,8 @@ <h5>class Cat</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>abstractMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">abstractMethod</span>(<wbr>)
@@ -73,7 +75,6 @@ <h5>class Cat</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method abstractMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Cat/hashCode.html b/testing/test_package_docs/ex/Cat/hashCode.html
index ccd0fc86d2..d52e31a8cc 100644
--- a/testing/test_package_docs/ex/Cat/hashCode.html
+++ b/testing/test_package_docs/ex/Cat/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Cat-class.html">Cat</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Cat</h5>
+    <h5>Cat class</h5>
     <ol>
       <li class="section-title"><a href="ex/Cat-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Cat/Cat.html">Cat</a></li>
@@ -63,6 +63,8 @@ <h5>class Cat</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -77,7 +79,6 @@ <h5>class Cat</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Cat/isImplemented.html b/testing/test_package_docs/ex/Cat/isImplemented.html
index 9fb706d810..2d876aa7c2 100644
--- a/testing/test_package_docs/ex/Cat/isImplemented.html
+++ b/testing/test_package_docs/ex/Cat/isImplemented.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Cat-class.html">Cat</a></li>
-    <li class="self-crumb">property isImplemented</li>
+    <li class="self-crumb">isImplemented property</li>
   </ol>
   <div class="self-name">isImplemented</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Cat</h5>
+    <h5>Cat class</h5>
     <ol>
       <li class="section-title"><a href="ex/Cat-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Cat/Cat.html">Cat</a></li>
@@ -63,6 +63,8 @@ <h5>class Cat</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>isImplemented property</h1>
+
 
         <section id="getter">
         
@@ -77,7 +79,6 @@ <h5>class Cat</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property isImplemented</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Cat/noSuchMethod.html b/testing/test_package_docs/ex/Cat/noSuchMethod.html
index fc641b29a2..2787670c92 100644
--- a/testing/test_package_docs/ex/Cat/noSuchMethod.html
+++ b/testing/test_package_docs/ex/Cat/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Cat-class.html">Cat</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Cat</h5>
+    <h5>Cat class</h5>
     <ol>
       <li class="section-title"><a href="ex/Cat-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Cat/Cat.html">Cat</a></li>
@@ -63,6 +63,8 @@ <h5>class Cat</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -73,7 +75,6 @@ <h5>class Cat</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Cat/operator_equals.html b/testing/test_package_docs/ex/Cat/operator_equals.html
index f22f2c7495..6ab382a900 100644
--- a/testing/test_package_docs/ex/Cat/operator_equals.html
+++ b/testing/test_package_docs/ex/Cat/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Cat-class.html">Cat</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Cat</h5>
+    <h5>Cat class</h5>
     <ol>
       <li class="section-title"><a href="ex/Cat-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Cat/Cat.html">Cat</a></li>
@@ -63,6 +63,8 @@ <h5>class Cat</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -73,7 +75,6 @@ <h5>class Cat</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Cat/runtimeType.html b/testing/test_package_docs/ex/Cat/runtimeType.html
index 50731e2589..ecdccc4ff3 100644
--- a/testing/test_package_docs/ex/Cat/runtimeType.html
+++ b/testing/test_package_docs/ex/Cat/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Cat-class.html">Cat</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Cat</h5>
+    <h5>Cat class</h5>
     <ol>
       <li class="section-title"><a href="ex/Cat-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Cat/Cat.html">Cat</a></li>
@@ -63,6 +63,8 @@ <h5>class Cat</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -77,7 +79,6 @@ <h5>class Cat</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Cat/toString.html b/testing/test_package_docs/ex/Cat/toString.html
index ccae9d059a..b416c91637 100644
--- a/testing/test_package_docs/ex/Cat/toString.html
+++ b/testing/test_package_docs/ex/Cat/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Cat-class.html">Cat</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Cat</h5>
+    <h5>Cat class</h5>
     <ol>
       <li class="section-title"><a href="ex/Cat-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Cat/Cat.html">Cat</a></li>
@@ -63,6 +63,8 @@ <h5>class Cat</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -73,7 +75,6 @@ <h5>class Cat</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/CatString-class.html b/testing/test_package_docs/ex/CatString-class.html
index 3f438d686b..69177df613 100644
--- a/testing/test_package_docs/ex/CatString-class.html
+++ b/testing/test_package_docs/ex/CatString-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class CatString</li>
+    <li class="self-crumb">CatString class</li>
   </ol>
   <div class="self-name">CatString</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>CatString class</h1>
 
     
     <section>
@@ -274,7 +275,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class CatString</h5>
     <ol>
       <li class="section-title"><a href="ex/CatString-class.html#constructors">Constructors</a></li>
       <li><a href="ex/CatString/CatString.html">CatString</a></li>
diff --git a/testing/test_package_docs/ex/CatString/CatString.html b/testing/test_package_docs/ex/CatString/CatString.html
index 124dea679f..6e2a92c8d9 100644
--- a/testing/test_package_docs/ex/CatString/CatString.html
+++ b/testing/test_package_docs/ex/CatString/CatString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/CatString-class.html">CatString</a></li>
-    <li class="self-crumb">constructor CatString</li>
+    <li class="self-crumb">CatString constructor</li>
   </ol>
   <div class="self-name">CatString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class CatString</h5>
+    <h5>CatString class</h5>
     <ol>
       <li class="section-title"><a href="ex/CatString-class.html#constructors">Constructors</a></li>
       <li><a href="ex/CatString/CatString.html">CatString</a></li>
@@ -69,6 +69,8 @@ <h5>class CatString</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>CatString constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">CatString</span>(<wbr>)
@@ -80,7 +82,6 @@ <h5>class CatString</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor CatString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/CatString/clear.html b/testing/test_package_docs/ex/CatString/clear.html
index fb9b794f60..eaa7ce1577 100644
--- a/testing/test_package_docs/ex/CatString/clear.html
+++ b/testing/test_package_docs/ex/CatString/clear.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/CatString-class.html">CatString</a></li>
-    <li class="self-crumb">method clear</li>
+    <li class="self-crumb">clear method</li>
   </ol>
   <div class="self-name">clear</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class CatString</h5>
+    <h5>CatString class</h5>
     <ol>
       <li class="section-title"><a href="ex/CatString-class.html#constructors">Constructors</a></li>
       <li><a href="ex/CatString/CatString.html">CatString</a></li>
@@ -69,6 +69,8 @@ <h5>class CatString</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>clear method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">clear</span>(<wbr>)
@@ -79,7 +81,6 @@ <h5>class CatString</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method clear</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/CatString/hashCode.html b/testing/test_package_docs/ex/CatString/hashCode.html
index 0ae215829f..db276dfa54 100644
--- a/testing/test_package_docs/ex/CatString/hashCode.html
+++ b/testing/test_package_docs/ex/CatString/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/CatString-class.html">CatString</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class CatString</h5>
+    <h5>CatString class</h5>
     <ol>
       <li class="section-title"><a href="ex/CatString-class.html#constructors">Constructors</a></li>
       <li><a href="ex/CatString/CatString.html">CatString</a></li>
@@ -69,6 +69,8 @@ <h5>class CatString</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -83,7 +85,6 @@ <h5>class CatString</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/CatString/isEmpty.html b/testing/test_package_docs/ex/CatString/isEmpty.html
index 1e38759386..1e2e80f090 100644
--- a/testing/test_package_docs/ex/CatString/isEmpty.html
+++ b/testing/test_package_docs/ex/CatString/isEmpty.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/CatString-class.html">CatString</a></li>
-    <li class="self-crumb">property isEmpty</li>
+    <li class="self-crumb">isEmpty property</li>
   </ol>
   <div class="self-name">isEmpty</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class CatString</h5>
+    <h5>CatString class</h5>
     <ol>
       <li class="section-title"><a href="ex/CatString-class.html#constructors">Constructors</a></li>
       <li><a href="ex/CatString/CatString.html">CatString</a></li>
@@ -69,6 +69,8 @@ <h5>class CatString</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>isEmpty property</h1>
+
 
         <section id="getter">
         
@@ -83,7 +85,6 @@ <h5>class CatString</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property isEmpty</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/CatString/isNotEmpty.html b/testing/test_package_docs/ex/CatString/isNotEmpty.html
index a0fd01d316..dc9d20d610 100644
--- a/testing/test_package_docs/ex/CatString/isNotEmpty.html
+++ b/testing/test_package_docs/ex/CatString/isNotEmpty.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/CatString-class.html">CatString</a></li>
-    <li class="self-crumb">property isNotEmpty</li>
+    <li class="self-crumb">isNotEmpty property</li>
   </ol>
   <div class="self-name">isNotEmpty</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class CatString</h5>
+    <h5>CatString class</h5>
     <ol>
       <li class="section-title"><a href="ex/CatString-class.html#constructors">Constructors</a></li>
       <li><a href="ex/CatString/CatString.html">CatString</a></li>
@@ -69,6 +69,8 @@ <h5>class CatString</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>isNotEmpty property</h1>
+
 
         <section id="getter">
         
@@ -83,7 +85,6 @@ <h5>class CatString</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property isNotEmpty</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/CatString/length.html b/testing/test_package_docs/ex/CatString/length.html
index 9f3c4f0492..8c6d9bcef3 100644
--- a/testing/test_package_docs/ex/CatString/length.html
+++ b/testing/test_package_docs/ex/CatString/length.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/CatString-class.html">CatString</a></li>
-    <li class="self-crumb">property length</li>
+    <li class="self-crumb">length property</li>
   </ol>
   <div class="self-name">length</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class CatString</h5>
+    <h5>CatString class</h5>
     <ol>
       <li class="section-title"><a href="ex/CatString-class.html#constructors">Constructors</a></li>
       <li><a href="ex/CatString/CatString.html">CatString</a></li>
@@ -69,6 +69,8 @@ <h5>class CatString</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>length property</h1>
+
 
         <section id="getter">
         
@@ -83,7 +85,6 @@ <h5>class CatString</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property length</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/CatString/noSuchMethod.html b/testing/test_package_docs/ex/CatString/noSuchMethod.html
index fc4b9af40a..54978a0350 100644
--- a/testing/test_package_docs/ex/CatString/noSuchMethod.html
+++ b/testing/test_package_docs/ex/CatString/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/CatString-class.html">CatString</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class CatString</h5>
+    <h5>CatString class</h5>
     <ol>
       <li class="section-title"><a href="ex/CatString-class.html#constructors">Constructors</a></li>
       <li><a href="ex/CatString/CatString.html">CatString</a></li>
@@ -69,6 +69,8 @@ <h5>class CatString</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -79,7 +81,6 @@ <h5>class CatString</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/CatString/operator_equals.html b/testing/test_package_docs/ex/CatString/operator_equals.html
index 495fb21898..1563488bca 100644
--- a/testing/test_package_docs/ex/CatString/operator_equals.html
+++ b/testing/test_package_docs/ex/CatString/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/CatString-class.html">CatString</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class CatString</h5>
+    <h5>CatString class</h5>
     <ol>
       <li class="section-title"><a href="ex/CatString-class.html#constructors">Constructors</a></li>
       <li><a href="ex/CatString/CatString.html">CatString</a></li>
@@ -69,6 +69,8 @@ <h5>class CatString</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -79,7 +81,6 @@ <h5>class CatString</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/CatString/runtimeType.html b/testing/test_package_docs/ex/CatString/runtimeType.html
index c72949712e..368782c3bb 100644
--- a/testing/test_package_docs/ex/CatString/runtimeType.html
+++ b/testing/test_package_docs/ex/CatString/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/CatString-class.html">CatString</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class CatString</h5>
+    <h5>CatString class</h5>
     <ol>
       <li class="section-title"><a href="ex/CatString-class.html#constructors">Constructors</a></li>
       <li><a href="ex/CatString/CatString.html">CatString</a></li>
@@ -69,6 +69,8 @@ <h5>class CatString</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -83,7 +85,6 @@ <h5>class CatString</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/CatString/toString.html b/testing/test_package_docs/ex/CatString/toString.html
index 9a9eaa57d6..16d788a9bb 100644
--- a/testing/test_package_docs/ex/CatString/toString.html
+++ b/testing/test_package_docs/ex/CatString/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/CatString-class.html">CatString</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class CatString</h5>
+    <h5>CatString class</h5>
     <ol>
       <li class="section-title"><a href="ex/CatString-class.html#constructors">Constructors</a></li>
       <li><a href="ex/CatString/CatString.html">CatString</a></li>
@@ -69,6 +69,8 @@ <h5>class CatString</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -79,7 +81,6 @@ <h5>class CatString</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/CatString/write.html b/testing/test_package_docs/ex/CatString/write.html
index 9b785c6aa7..d356f11a2a 100644
--- a/testing/test_package_docs/ex/CatString/write.html
+++ b/testing/test_package_docs/ex/CatString/write.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/CatString-class.html">CatString</a></li>
-    <li class="self-crumb">method write</li>
+    <li class="self-crumb">write method</li>
   </ol>
   <div class="self-name">write</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class CatString</h5>
+    <h5>CatString class</h5>
     <ol>
       <li class="section-title"><a href="ex/CatString-class.html#constructors">Constructors</a></li>
       <li><a href="ex/CatString/CatString.html">CatString</a></li>
@@ -69,6 +69,8 @@ <h5>class CatString</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>write method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">write</span>(<wbr><span class="parameter" id="write-param-obj"><span class="type-annotation">Object</span> <span class="parameter-name">obj</span></span>)
@@ -79,7 +81,6 @@ <h5>class CatString</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method write</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/CatString/writeAll.html b/testing/test_package_docs/ex/CatString/writeAll.html
index c2d0ffd512..d9e5e6b119 100644
--- a/testing/test_package_docs/ex/CatString/writeAll.html
+++ b/testing/test_package_docs/ex/CatString/writeAll.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/CatString-class.html">CatString</a></li>
-    <li class="self-crumb">method writeAll</li>
+    <li class="self-crumb">writeAll method</li>
   </ol>
   <div class="self-name">writeAll</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class CatString</h5>
+    <h5>CatString class</h5>
     <ol>
       <li class="section-title"><a href="ex/CatString-class.html#constructors">Constructors</a></li>
       <li><a href="ex/CatString/CatString.html">CatString</a></li>
@@ -69,6 +69,8 @@ <h5>class CatString</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>writeAll method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">writeAll</span>(<wbr><span class="parameter" id="writeAll-param-objects"><span class="type-annotation">Iterable</span> <span class="parameter-name">objects</span>, [</span> <span class="parameter" id="writeAll-param-separator"><span class="type-annotation">String</span> <span class="parameter-name">separator</span> = <span class="default-value">""</span></span> ])
@@ -79,7 +81,6 @@ <h5>class CatString</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method writeAll</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/CatString/writeCharCode.html b/testing/test_package_docs/ex/CatString/writeCharCode.html
index 1ed85718e5..f45d0f25e7 100644
--- a/testing/test_package_docs/ex/CatString/writeCharCode.html
+++ b/testing/test_package_docs/ex/CatString/writeCharCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/CatString-class.html">CatString</a></li>
-    <li class="self-crumb">method writeCharCode</li>
+    <li class="self-crumb">writeCharCode method</li>
   </ol>
   <div class="self-name">writeCharCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class CatString</h5>
+    <h5>CatString class</h5>
     <ol>
       <li class="section-title"><a href="ex/CatString-class.html#constructors">Constructors</a></li>
       <li><a href="ex/CatString/CatString.html">CatString</a></li>
@@ -69,6 +69,8 @@ <h5>class CatString</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>writeCharCode method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">writeCharCode</span>(<wbr><span class="parameter" id="writeCharCode-param-charCode"><span class="type-annotation">int</span> <span class="parameter-name">charCode</span></span>)
@@ -79,7 +81,6 @@ <h5>class CatString</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method writeCharCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/CatString/writeln.html b/testing/test_package_docs/ex/CatString/writeln.html
index 000cd87548..e0841d920c 100644
--- a/testing/test_package_docs/ex/CatString/writeln.html
+++ b/testing/test_package_docs/ex/CatString/writeln.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/CatString-class.html">CatString</a></li>
-    <li class="self-crumb">method writeln</li>
+    <li class="self-crumb">writeln method</li>
   </ol>
   <div class="self-name">writeln</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class CatString</h5>
+    <h5>CatString class</h5>
     <ol>
       <li class="section-title"><a href="ex/CatString-class.html#constructors">Constructors</a></li>
       <li><a href="ex/CatString/CatString.html">CatString</a></li>
@@ -69,6 +69,8 @@ <h5>class CatString</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>writeln method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">writeln</span>(<wbr>[<span class="parameter" id="writeln-param-obj"><span class="type-annotation">Object</span> <span class="parameter-name">obj</span> = <span class="default-value">""</span></span> ])
@@ -79,7 +81,6 @@ <h5>class CatString</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method writeln</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ConstantCat-class.html b/testing/test_package_docs/ex/ConstantCat-class.html
index b1d9ca0474..87f497c202 100644
--- a/testing/test_package_docs/ex/ConstantCat-class.html
+++ b/testing/test_package_docs/ex/ConstantCat-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class ConstantCat</li>
+    <li class="self-crumb">ConstantCat class</li>
   </ol>
   <div class="self-name">ConstantCat</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ConstantCat class</h1>
 
     
     <section>
@@ -231,7 +232,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class ConstantCat</h5>
     <ol>
       <li class="section-title"><a href="ex/ConstantCat-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ConstantCat/ConstantCat.html">ConstantCat</a></li>
diff --git a/testing/test_package_docs/ex/ConstantCat/ConstantCat.html b/testing/test_package_docs/ex/ConstantCat/ConstantCat.html
index 0821413d5e..087a1b5a95 100644
--- a/testing/test_package_docs/ex/ConstantCat/ConstantCat.html
+++ b/testing/test_package_docs/ex/ConstantCat/ConstantCat.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ConstantCat-class.html">ConstantCat</a></li>
-    <li class="self-crumb">const constructor ConstantCat</li>
+    <li class="self-crumb">ConstantCat const constructor</li>
   </ol>
   <div class="self-name">ConstantCat</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ConstantCat</h5>
+    <h5>ConstantCat class</h5>
     <ol>
       <li class="section-title"><a href="ex/ConstantCat-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ConstantCat/ConstantCat.html">ConstantCat</a></li>
@@ -64,6 +64,8 @@ <h5>class ConstantCat</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ConstantCat constructor</h1>
+
     <section class="multi-line-signature">
       const
       <span class="name ">ConstantCat</span>(<wbr><span class="parameter" id="-param-name"><span class="type-annotation">String</span> <span class="parameter-name">name</span></span>)
@@ -75,7 +77,6 @@ <h5>class ConstantCat</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor ConstantCat</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ConstantCat/abstractMethod.html b/testing/test_package_docs/ex/ConstantCat/abstractMethod.html
index f82824ed93..440771ec3f 100644
--- a/testing/test_package_docs/ex/ConstantCat/abstractMethod.html
+++ b/testing/test_package_docs/ex/ConstantCat/abstractMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ConstantCat-class.html">ConstantCat</a></li>
-    <li class="self-crumb">method abstractMethod</li>
+    <li class="self-crumb">abstractMethod method</li>
   </ol>
   <div class="self-name">abstractMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ConstantCat</h5>
+    <h5>ConstantCat class</h5>
     <ol>
       <li class="section-title"><a href="ex/ConstantCat-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ConstantCat/ConstantCat.html">ConstantCat</a></li>
@@ -64,6 +64,8 @@ <h5>class ConstantCat</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>abstractMethod method</h1>
+
     <section class="multi-line-signature">
       <div>
         <ol class="annotation-list">
@@ -79,7 +81,6 @@ <h5>class ConstantCat</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method abstractMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ConstantCat/isImplemented.html b/testing/test_package_docs/ex/ConstantCat/isImplemented.html
index dfd1ee0ab7..dd7a7286db 100644
--- a/testing/test_package_docs/ex/ConstantCat/isImplemented.html
+++ b/testing/test_package_docs/ex/ConstantCat/isImplemented.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ConstantCat-class.html">ConstantCat</a></li>
-    <li class="self-crumb">property isImplemented</li>
+    <li class="self-crumb">isImplemented property</li>
   </ol>
   <div class="self-name">isImplemented</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ConstantCat</h5>
+    <h5>ConstantCat class</h5>
     <ol>
       <li class="section-title"><a href="ex/ConstantCat-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ConstantCat/ConstantCat.html">ConstantCat</a></li>
@@ -64,6 +64,8 @@ <h5>class ConstantCat</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>isImplemented property</h1>
+
 
         <section id="getter">
         
@@ -78,7 +80,6 @@ <h5>class ConstantCat</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property isImplemented</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ConstantCat/name.html b/testing/test_package_docs/ex/ConstantCat/name.html
index 5c586d27eb..8530927a9e 100644
--- a/testing/test_package_docs/ex/ConstantCat/name.html
+++ b/testing/test_package_docs/ex/ConstantCat/name.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ConstantCat-class.html">ConstantCat</a></li>
-    <li class="self-crumb">property name</li>
+    <li class="self-crumb">name property</li>
   </ol>
   <div class="self-name">name</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ConstantCat</h5>
+    <h5>ConstantCat class</h5>
     <ol>
       <li class="section-title"><a href="ex/ConstantCat-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ConstantCat/ConstantCat.html">ConstantCat</a></li>
@@ -64,6 +64,8 @@ <h5>class ConstantCat</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>name property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">String</span>
           <span class="name ">name</span>          <div class="features">final</div>
@@ -73,7 +75,6 @@ <h5>class ConstantCat</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property name</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Deprecated-class.html b/testing/test_package_docs/ex/Deprecated-class.html
index c3024e4523..686c02aada 100644
--- a/testing/test_package_docs/ex/Deprecated-class.html
+++ b/testing/test_package_docs/ex/Deprecated-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class Deprecated</li>
+    <li class="self-crumb">Deprecated class</li>
   </ol>
   <div class="self-name">Deprecated</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Deprecated class</h1>
 
     
 
@@ -200,7 +201,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class Deprecated</h5>
     <ol>
       <li class="section-title"><a href="ex/Deprecated-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Deprecated/Deprecated.html">Deprecated</a></li>
diff --git a/testing/test_package_docs/ex/Deprecated/Deprecated.html b/testing/test_package_docs/ex/Deprecated/Deprecated.html
index 680c6cf9c9..29cfbfa237 100644
--- a/testing/test_package_docs/ex/Deprecated/Deprecated.html
+++ b/testing/test_package_docs/ex/Deprecated/Deprecated.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Deprecated-class.html">Deprecated</a></li>
-    <li class="self-crumb">const constructor Deprecated</li>
+    <li class="self-crumb">Deprecated const constructor</li>
   </ol>
   <div class="self-name">Deprecated</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Deprecated</h5>
+    <h5>Deprecated class</h5>
     <ol>
       <li class="section-title"><a href="ex/Deprecated-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Deprecated/Deprecated.html">Deprecated</a></li>
@@ -62,6 +62,8 @@ <h5>class Deprecated</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Deprecated constructor</h1>
+
     <section class="multi-line-signature">
       const
       <span class="name ">Deprecated</span>(<wbr><span class="parameter" id="-param-expires"><span class="type-annotation">String</span> <span class="parameter-name">expires</span></span>)
@@ -73,7 +75,6 @@ <h5>class Deprecated</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor Deprecated</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Deprecated/expires.html b/testing/test_package_docs/ex/Deprecated/expires.html
index e00d8206e9..fe4e9527a3 100644
--- a/testing/test_package_docs/ex/Deprecated/expires.html
+++ b/testing/test_package_docs/ex/Deprecated/expires.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Deprecated-class.html">Deprecated</a></li>
-    <li class="self-crumb">property expires</li>
+    <li class="self-crumb">expires property</li>
   </ol>
   <div class="self-name">expires</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Deprecated</h5>
+    <h5>Deprecated class</h5>
     <ol>
       <li class="section-title"><a href="ex/Deprecated-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Deprecated/Deprecated.html">Deprecated</a></li>
@@ -62,6 +62,8 @@ <h5>class Deprecated</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>expires property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">String</span>
           <span class="name ">expires</span>          <div class="features">final</div>
@@ -71,7 +73,6 @@ <h5>class Deprecated</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property expires</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Deprecated/hashCode.html b/testing/test_package_docs/ex/Deprecated/hashCode.html
index 9a48e8174b..c33caeeef0 100644
--- a/testing/test_package_docs/ex/Deprecated/hashCode.html
+++ b/testing/test_package_docs/ex/Deprecated/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Deprecated-class.html">Deprecated</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Deprecated</h5>
+    <h5>Deprecated class</h5>
     <ol>
       <li class="section-title"><a href="ex/Deprecated-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Deprecated/Deprecated.html">Deprecated</a></li>
@@ -62,6 +62,8 @@ <h5>class Deprecated</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class Deprecated</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Deprecated/noSuchMethod.html b/testing/test_package_docs/ex/Deprecated/noSuchMethod.html
index 981a4835df..1cd6dcea92 100644
--- a/testing/test_package_docs/ex/Deprecated/noSuchMethod.html
+++ b/testing/test_package_docs/ex/Deprecated/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Deprecated-class.html">Deprecated</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Deprecated</h5>
+    <h5>Deprecated class</h5>
     <ol>
       <li class="section-title"><a href="ex/Deprecated-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Deprecated/Deprecated.html">Deprecated</a></li>
@@ -62,6 +62,8 @@ <h5>class Deprecated</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -72,7 +74,6 @@ <h5>class Deprecated</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Deprecated/operator_equals.html b/testing/test_package_docs/ex/Deprecated/operator_equals.html
index c4cd56e24a..3db47aa561 100644
--- a/testing/test_package_docs/ex/Deprecated/operator_equals.html
+++ b/testing/test_package_docs/ex/Deprecated/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Deprecated-class.html">Deprecated</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Deprecated</h5>
+    <h5>Deprecated class</h5>
     <ol>
       <li class="section-title"><a href="ex/Deprecated-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Deprecated/Deprecated.html">Deprecated</a></li>
@@ -62,6 +62,8 @@ <h5>class Deprecated</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -72,7 +74,6 @@ <h5>class Deprecated</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Deprecated/runtimeType.html b/testing/test_package_docs/ex/Deprecated/runtimeType.html
index 9cb7062b1a..24f514b0e3 100644
--- a/testing/test_package_docs/ex/Deprecated/runtimeType.html
+++ b/testing/test_package_docs/ex/Deprecated/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Deprecated-class.html">Deprecated</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Deprecated</h5>
+    <h5>Deprecated class</h5>
     <ol>
       <li class="section-title"><a href="ex/Deprecated-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Deprecated/Deprecated.html">Deprecated</a></li>
@@ -62,6 +62,8 @@ <h5>class Deprecated</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class Deprecated</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Deprecated/toString.html b/testing/test_package_docs/ex/Deprecated/toString.html
index 0d01df7c69..08e06250eb 100644
--- a/testing/test_package_docs/ex/Deprecated/toString.html
+++ b/testing/test_package_docs/ex/Deprecated/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Deprecated-class.html">Deprecated</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Deprecated</h5>
+    <h5>Deprecated class</h5>
     <ol>
       <li class="section-title"><a href="ex/Deprecated-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Deprecated/Deprecated.html">Deprecated</a></li>
@@ -62,6 +62,8 @@ <h5>class Deprecated</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class Deprecated</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog-class.html b/testing/test_package_docs/ex/Dog-class.html
index c003251a8c..9d19e10633 100644
--- a/testing/test_package_docs/ex/Dog-class.html
+++ b/testing/test_package_docs/ex/Dog-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class Dog</li>
+    <li class="self-crumb">Dog class</li>
   </ol>
   <div class="self-name">Dog</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Dog class</h1>
 
     <section class="desc markdown">
       <p>implements <a href="ex/Cat-class.html">Cat</a>, <a href="ex/E-class.html">E</a></p>
@@ -436,7 +437,6 @@ <h2>Constants</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class Dog</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
diff --git a/testing/test_package_docs/ex/Dog/Dog.deprecatedCreate.html b/testing/test_package_docs/ex/Dog/Dog.deprecatedCreate.html
index 5c7afaa125..039f8755e6 100644
--- a/testing/test_package_docs/ex/Dog/Dog.deprecatedCreate.html
+++ b/testing/test_package_docs/ex/Dog/Dog.deprecatedCreate.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">constructor <span class="deprecated">Dog.deprecatedCreate</span></li>
+    <li class="self-crumb"><span class="deprecated">Dog.deprecatedCreate</span> constructor</li>
   </ol>
   <div class="self-name">Dog.deprecatedCreate</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Dog.deprecatedCreate constructor</h1>
+
     <section class="multi-line-signature">
       <div>
         <ol class="annotation-list">
@@ -103,7 +105,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor Dog.deprecatedCreate</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/Dog.html b/testing/test_package_docs/ex/Dog/Dog.html
index f500737377..fc0c223e16 100644
--- a/testing/test_package_docs/ex/Dog/Dog.html
+++ b/testing/test_package_docs/ex/Dog/Dog.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">constructor Dog</li>
+    <li class="self-crumb">Dog constructor</li>
   </ol>
   <div class="self-name">Dog</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Dog constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">Dog</span>(<wbr>)
@@ -98,7 +100,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/aFinalField.html b/testing/test_package_docs/ex/Dog/aFinalField.html
index f6faad0756..215c0ef01c 100644
--- a/testing/test_package_docs/ex/Dog/aFinalField.html
+++ b/testing/test_package_docs/ex/Dog/aFinalField.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">property aFinalField</li>
+    <li class="self-crumb">aFinalField property</li>
   </ol>
   <div class="self-name">aFinalField</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aFinalField property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">int</span>
           <span class="name ">aFinalField</span>          <div class="features">final</div>
@@ -96,7 +98,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property aFinalField</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/aGetterReturningRandomThings.html b/testing/test_package_docs/ex/Dog/aGetterReturningRandomThings.html
index 7087d3949f..799e4a4e0a 100644
--- a/testing/test_package_docs/ex/Dog/aGetterReturningRandomThings.html
+++ b/testing/test_package_docs/ex/Dog/aGetterReturningRandomThings.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">property aGetterReturningRandomThings</li>
+    <li class="self-crumb">aGetterReturningRandomThings property</li>
   </ol>
   <div class="self-name">aGetterReturningRandomThings</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aGetterReturningRandomThings property</h1>
+
 
         <section id="getter">
         
@@ -101,7 +103,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property aGetterReturningRandomThings</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/aName-constant.html b/testing/test_package_docs/ex/Dog/aName-constant.html
index ca94732224..b37cc87c35 100644
--- a/testing/test_package_docs/ex/Dog/aName-constant.html
+++ b/testing/test_package_docs/ex/Dog/aName-constant.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">constant aName</li>
+    <li class="self-crumb">aName constant</li>
   </ol>
   <div class="self-name">aName</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,7 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aName property</h1>
 
     <section class="multi-line-signature">
         <span class="returntype"><a href="ex/ShortName-class.html">ShortName</a></span>
@@ -102,7 +103,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property aName</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/aProtectedFinalField.html b/testing/test_package_docs/ex/Dog/aProtectedFinalField.html
index 4d391dc41a..32ea2dadf5 100644
--- a/testing/test_package_docs/ex/Dog/aProtectedFinalField.html
+++ b/testing/test_package_docs/ex/Dog/aProtectedFinalField.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">property aProtectedFinalField</li>
+    <li class="self-crumb">aProtectedFinalField property</li>
   </ol>
   <div class="self-name">aProtectedFinalField</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aProtectedFinalField property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">int</span>
           <span class="name ">aProtectedFinalField</span>          <div class="features">@protected, final</div>
@@ -96,7 +98,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property aProtectedFinalField</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/aStaticConstField-constant.html b/testing/test_package_docs/ex/Dog/aStaticConstField-constant.html
index 7862dfaf02..30c572f686 100644
--- a/testing/test_package_docs/ex/Dog/aStaticConstField-constant.html
+++ b/testing/test_package_docs/ex/Dog/aStaticConstField-constant.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">constant aStaticConstField</li>
+    <li class="self-crumb">aStaticConstField constant</li>
   </ol>
   <div class="self-name">aStaticConstField</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,7 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aStaticConstField property</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">String</span>
@@ -99,7 +100,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property aStaticConstField</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/abstractMethod.html b/testing/test_package_docs/ex/Dog/abstractMethod.html
index 65cda5b2cc..e55f878fda 100644
--- a/testing/test_package_docs/ex/Dog/abstractMethod.html
+++ b/testing/test_package_docs/ex/Dog/abstractMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">method abstractMethod</li>
+    <li class="self-crumb">abstractMethod method</li>
   </ol>
   <div class="self-name">abstractMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>abstractMethod method</h1>
+
     <section class="multi-line-signature">
       <div>
         <ol class="annotation-list">
@@ -102,7 +104,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method abstractMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/createDog.html b/testing/test_package_docs/ex/Dog/createDog.html
index 3f40bc1acc..d5aa368f27 100644
--- a/testing/test_package_docs/ex/Dog/createDog.html
+++ b/testing/test_package_docs/ex/Dog/createDog.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">method <span class="deprecated">createDog</span></li>
+    <li class="self-crumb"><span class="deprecated">createDog</span> method</li>
   </ol>
   <div class="self-name">createDog</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>createDog method</h1>
+
     <section class="multi-line-signature">
       <div>
         <ol class="annotation-list">
@@ -102,7 +104,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method createDog</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/deprecatedField.html b/testing/test_package_docs/ex/Dog/deprecatedField.html
index 852bd4eac9..90362b48d8 100644
--- a/testing/test_package_docs/ex/Dog/deprecatedField.html
+++ b/testing/test_package_docs/ex/Dog/deprecatedField.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">property <span class="deprecated">deprecatedField</span></li>
+    <li class="self-crumb"><span class="deprecated">deprecatedField</span> property</li>
   </ol>
   <div class="self-name">deprecatedField</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>deprecatedField property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">int</span>
           <span class="name deprecated">deprecatedField</span>          <div class="features">read / write</div>
@@ -96,7 +98,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property deprecatedField</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/deprecatedGetter.html b/testing/test_package_docs/ex/Dog/deprecatedGetter.html
index 6f612b19c7..ee7dbde16f 100644
--- a/testing/test_package_docs/ex/Dog/deprecatedGetter.html
+++ b/testing/test_package_docs/ex/Dog/deprecatedGetter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">property <span class="deprecated">deprecatedGetter</span></li>
+    <li class="self-crumb"><span class="deprecated">deprecatedGetter</span> property</li>
   </ol>
   <div class="self-name">deprecatedGetter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>deprecatedGetter property</h1>
+
 
         <section id="getter">
         
@@ -101,7 +103,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property deprecatedGetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/deprecatedSetter.html b/testing/test_package_docs/ex/Dog/deprecatedSetter.html
index 1abe465b9b..c83e6e12d4 100644
--- a/testing/test_package_docs/ex/Dog/deprecatedSetter.html
+++ b/testing/test_package_docs/ex/Dog/deprecatedSetter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">property <span class="deprecated">deprecatedSetter</span></li>
+    <li class="self-crumb"><span class="deprecated">deprecatedSetter</span> property</li>
   </ol>
   <div class="self-name">deprecatedSetter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>deprecatedSetter property</h1>
+
 
 
         <section id="setter">
@@ -102,7 +104,6 @@ <h5>class Dog</h5>
           </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property deprecatedSetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/foo.html b/testing/test_package_docs/ex/Dog/foo.html
index 682db4c7cc..d824cf8b33 100644
--- a/testing/test_package_docs/ex/Dog/foo.html
+++ b/testing/test_package_docs/ex/Dog/foo.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">method foo</li>
+    <li class="self-crumb">foo method</li>
   </ol>
   <div class="self-name">foo</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>foo method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Future</span>
       <span class="name ">foo</span>(<wbr>)
@@ -97,7 +99,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method foo</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/getAnotherClassD.html b/testing/test_package_docs/ex/Dog/getAnotherClassD.html
index f97cc6e3e7..0abea24e21 100644
--- a/testing/test_package_docs/ex/Dog/getAnotherClassD.html
+++ b/testing/test_package_docs/ex/Dog/getAnotherClassD.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">method <span class="deprecated">getAnotherClassD</span></li>
+    <li class="self-crumb"><span class="deprecated">getAnotherClassD</span> method</li>
   </ol>
   <div class="self-name">getAnotherClassD</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>getAnotherClassD method</h1>
+
     <section class="multi-line-signature">
       <div>
         <ol class="annotation-list">
@@ -102,7 +104,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method getAnotherClassD</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/getClassA.html b/testing/test_package_docs/ex/Dog/getClassA.html
index 79b12e3589..32948a2f28 100644
--- a/testing/test_package_docs/ex/Dog/getClassA.html
+++ b/testing/test_package_docs/ex/Dog/getClassA.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">method <span class="deprecated">getClassA</span></li>
+    <li class="self-crumb"><span class="deprecated">getClassA</span> method</li>
   </ol>
   <div class="self-name">getClassA</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>getClassA method</h1>
+
     <section class="multi-line-signature">
       <div>
         <ol class="annotation-list">
@@ -102,7 +104,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method getClassA</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/isImplemented.html b/testing/test_package_docs/ex/Dog/isImplemented.html
index 49ceee66e5..d832c6543d 100644
--- a/testing/test_package_docs/ex/Dog/isImplemented.html
+++ b/testing/test_package_docs/ex/Dog/isImplemented.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">property isImplemented</li>
+    <li class="self-crumb">isImplemented property</li>
   </ol>
   <div class="self-name">isImplemented</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>isImplemented property</h1>
+
 
         <section id="getter">
         
@@ -101,7 +103,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property isImplemented</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/name.html b/testing/test_package_docs/ex/Dog/name.html
index 73e73d286f..51fa129488 100644
--- a/testing/test_package_docs/ex/Dog/name.html
+++ b/testing/test_package_docs/ex/Dog/name.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">property name</li>
+    <li class="self-crumb">name property</li>
   </ol>
   <div class="self-name">name</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>name property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">String</span>
           <span class="name ">name</span>          <div class="features">read / write</div>
@@ -96,7 +98,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property name</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/operator_equals.html b/testing/test_package_docs/ex/Dog/operator_equals.html
index 19193ae86c..4edb165892 100644
--- a/testing/test_package_docs/ex/Dog/operator_equals.html
+++ b/testing/test_package_docs/ex/Dog/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <div>
         <ol class="annotation-list">
@@ -102,7 +104,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/somethingTasty.html b/testing/test_package_docs/ex/Dog/somethingTasty.html
index cf3b7956d3..7f889a14d7 100644
--- a/testing/test_package_docs/ex/Dog/somethingTasty.html
+++ b/testing/test_package_docs/ex/Dog/somethingTasty.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">property somethingTasty</li>
+    <li class="self-crumb">somethingTasty property</li>
   </ol>
   <div class="self-name">somethingTasty</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>somethingTasty property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">int</span>
           <span class="name ">somethingTasty</span>          <div class="features">final</div>
@@ -99,7 +101,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property somethingTasty</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/staticGetterSetter.html b/testing/test_package_docs/ex/Dog/staticGetterSetter.html
index 8e0f94cd00..c646cd1f59 100644
--- a/testing/test_package_docs/ex/Dog/staticGetterSetter.html
+++ b/testing/test_package_docs/ex/Dog/staticGetterSetter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">property staticGetterSetter</li>
+    <li class="self-crumb">staticGetterSetter property</li>
   </ol>
   <div class="self-name">staticGetterSetter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>staticGetterSetter property</h1>
+
 
         <section id="getter">
         
@@ -111,7 +113,6 @@ <h5>class Dog</h5>
           </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property staticGetterSetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/testGeneric.html b/testing/test_package_docs/ex/Dog/testGeneric.html
index de1cac47da..c1a100c386 100644
--- a/testing/test_package_docs/ex/Dog/testGeneric.html
+++ b/testing/test_package_docs/ex/Dog/testGeneric.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">method testGeneric</li>
+    <li class="self-crumb">testGeneric method</li>
   </ol>
   <div class="self-name">testGeneric</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>testGeneric method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">testGeneric</span>(<wbr><span class="parameter" id="testGeneric-param-args"><span class="type-annotation">Map<span class="signature">&lt;String, dynamic&gt;</span></span> <span class="parameter-name">args</span></span>)
@@ -97,7 +99,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method testGeneric</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/testGenericMethod.html b/testing/test_package_docs/ex/Dog/testGenericMethod.html
index 6e69480fe2..ae58685a6b 100644
--- a/testing/test_package_docs/ex/Dog/testGenericMethod.html
+++ b/testing/test_package_docs/ex/Dog/testGenericMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">method testGenericMethod&lt;T&gt;</li>
+    <li class="self-crumb">testGenericMethod&lt;T&gt; method</li>
   </ol>
   <div class="self-name">testGenericMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>testGenericMethod&lt;T&gt; method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">T</span>
       <span class="name ">testGenericMethod</span>&lt;T&gt;(<wbr><span class="parameter" id="testGenericMethod-param-arg"><span class="type-annotation">T</span> <span class="parameter-name">arg</span></span>)
@@ -97,7 +99,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method testGenericMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/testMethod.html b/testing/test_package_docs/ex/Dog/testMethod.html
index a664861bfd..dbdf7d02e8 100644
--- a/testing/test_package_docs/ex/Dog/testMethod.html
+++ b/testing/test_package_docs/ex/Dog/testMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">method testMethod</li>
+    <li class="self-crumb">testMethod method</li>
   </ol>
   <div class="self-name">testMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>testMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">testMethod</span>(<wbr><span class="parameter" id="testMethod-param-it"><span class="type-annotation">Iterable</span> <span class="parameter-name">it</span></span>)
@@ -97,7 +99,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method testMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/withMacro.html b/testing/test_package_docs/ex/Dog/withMacro.html
index df3db133ef..229d1a1a0a 100644
--- a/testing/test_package_docs/ex/Dog/withMacro.html
+++ b/testing/test_package_docs/ex/Dog/withMacro.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">method withMacro</li>
+    <li class="self-crumb">withMacro method</li>
   </ol>
   <div class="self-name">withMacro</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>withMacro method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">withMacro</span>(<wbr>)
@@ -102,7 +104,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method withMacro</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Dog/withMacro2.html b/testing/test_package_docs/ex/Dog/withMacro2.html
index cc85f23653..d04609406a 100644
--- a/testing/test_package_docs/ex/Dog/withMacro2.html
+++ b/testing/test_package_docs/ex/Dog/withMacro2.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">method withMacro2</li>
+    <li class="self-crumb">withMacro2 method</li>
   </ol>
   <div class="self-name">withMacro2</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Dog</h5>
+    <h5>Dog class</h5>
     <ol>
       <li class="section-title"><a href="ex/Dog-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Dog/Dog.html">Dog</a></li>
@@ -87,6 +87,8 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>withMacro2 method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">withMacro2</span>(<wbr>)
@@ -100,7 +102,6 @@ <h5>class Dog</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method withMacro2</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/E-class.html b/testing/test_package_docs/ex/E-class.html
index ec948eed61..3430ba64e2 100644
--- a/testing/test_package_docs/ex/E-class.html
+++ b/testing/test_package_docs/ex/E-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">abstract class E</li>
+    <li class="self-crumb">E abstract class</li>
   </ol>
   <div class="self-name">E</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>E class</h1>
 
     
     <section>
@@ -203,7 +204,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class E</h5>
     <ol>
       <li class="section-title"><a href="ex/E-class.html#constructors">Constructors</a></li>
       <li><a href="ex/E/E.html">E</a></li>
diff --git a/testing/test_package_docs/ex/E/E.html b/testing/test_package_docs/ex/E/E.html
index 1f63a9d759..4f0e457ee9 100644
--- a/testing/test_package_docs/ex/E/E.html
+++ b/testing/test_package_docs/ex/E/E.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/E-class.html">E</a></li>
-    <li class="self-crumb">constructor E</li>
+    <li class="self-crumb">E constructor</li>
   </ol>
   <div class="self-name">E</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class E</h5>
+    <h5>E class</h5>
     <ol>
       <li class="section-title"><a href="ex/E-class.html#constructors">Constructors</a></li>
       <li><a href="ex/E/E.html">E</a></li>
@@ -61,6 +61,8 @@ <h5>class E</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>E constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">E</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class E</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor E</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/E/hashCode.html b/testing/test_package_docs/ex/E/hashCode.html
index b835a09e99..09e3f39e38 100644
--- a/testing/test_package_docs/ex/E/hashCode.html
+++ b/testing/test_package_docs/ex/E/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/E-class.html">E</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class E</h5>
+    <h5>E class</h5>
     <ol>
       <li class="section-title"><a href="ex/E-class.html#constructors">Constructors</a></li>
       <li><a href="ex/E/E.html">E</a></li>
@@ -61,6 +61,8 @@ <h5>class E</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class E</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/E/noSuchMethod.html b/testing/test_package_docs/ex/E/noSuchMethod.html
index c10c774ea8..92992195a5 100644
--- a/testing/test_package_docs/ex/E/noSuchMethod.html
+++ b/testing/test_package_docs/ex/E/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/E-class.html">E</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class E</h5>
+    <h5>E class</h5>
     <ol>
       <li class="section-title"><a href="ex/E-class.html#constructors">Constructors</a></li>
       <li><a href="ex/E/E.html">E</a></li>
@@ -61,6 +61,8 @@ <h5>class E</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -71,7 +73,6 @@ <h5>class E</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/E/operator_equals.html b/testing/test_package_docs/ex/E/operator_equals.html
index 8cbf4bc8db..86c8da4473 100644
--- a/testing/test_package_docs/ex/E/operator_equals.html
+++ b/testing/test_package_docs/ex/E/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/E-class.html">E</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class E</h5>
+    <h5>E class</h5>
     <ol>
       <li class="section-title"><a href="ex/E-class.html#constructors">Constructors</a></li>
       <li><a href="ex/E/E.html">E</a></li>
@@ -61,6 +61,8 @@ <h5>class E</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -71,7 +73,6 @@ <h5>class E</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/E/runtimeType.html b/testing/test_package_docs/ex/E/runtimeType.html
index b4149f87dc..3fd2788def 100644
--- a/testing/test_package_docs/ex/E/runtimeType.html
+++ b/testing/test_package_docs/ex/E/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/E-class.html">E</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class E</h5>
+    <h5>E class</h5>
     <ol>
       <li class="section-title"><a href="ex/E-class.html#constructors">Constructors</a></li>
       <li><a href="ex/E/E.html">E</a></li>
@@ -61,6 +61,8 @@ <h5>class E</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class E</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/E/toString.html b/testing/test_package_docs/ex/E/toString.html
index 57388ddc54..6a75f19566 100644
--- a/testing/test_package_docs/ex/E/toString.html
+++ b/testing/test_package_docs/ex/E/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/E-class.html">E</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class E</h5>
+    <h5>E class</h5>
     <ol>
       <li class="section-title"><a href="ex/E-class.html#constructors">Constructors</a></li>
       <li><a href="ex/E/E.html">E</a></li>
@@ -61,6 +61,8 @@ <h5>class E</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -71,7 +73,6 @@ <h5>class E</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ExtendedShortName-class.html b/testing/test_package_docs/ex/ExtendedShortName-class.html
index cace833572..9c371163c6 100644
--- a/testing/test_package_docs/ex/ExtendedShortName-class.html
+++ b/testing/test_package_docs/ex/ExtendedShortName-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class ExtendedShortName</li>
+    <li class="self-crumb">ExtendedShortName class</li>
   </ol>
   <div class="self-name">ExtendedShortName</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ExtendedShortName class</h1>
 
     
     <section>
@@ -214,7 +215,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class ExtendedShortName</h5>
     <ol>
       <li class="section-title"><a href="ex/ExtendedShortName-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ExtendedShortName/ExtendedShortName.html">ExtendedShortName</a></li>
diff --git a/testing/test_package_docs/ex/ExtendedShortName/ExtendedShortName.html b/testing/test_package_docs/ex/ExtendedShortName/ExtendedShortName.html
index 746d1bf0db..a92a24c4a2 100644
--- a/testing/test_package_docs/ex/ExtendedShortName/ExtendedShortName.html
+++ b/testing/test_package_docs/ex/ExtendedShortName/ExtendedShortName.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ExtendedShortName-class.html">ExtendedShortName</a></li>
-    <li class="self-crumb">const constructor ExtendedShortName</li>
+    <li class="self-crumb">ExtendedShortName const constructor</li>
   </ol>
   <div class="self-name">ExtendedShortName</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ExtendedShortName</h5>
+    <h5>ExtendedShortName class</h5>
     <ol>
       <li class="section-title"><a href="ex/ExtendedShortName-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ExtendedShortName/ExtendedShortName.html">ExtendedShortName</a></li>
@@ -62,6 +62,8 @@ <h5>class ExtendedShortName</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ExtendedShortName constructor</h1>
+
     <section class="multi-line-signature">
       const
       <span class="name ">ExtendedShortName</span>(<wbr><span class="parameter" id="-param-aParameter"><span class="type-annotation">String</span> <span class="parameter-name">aParameter</span></span>)
@@ -73,7 +75,6 @@ <h5>class ExtendedShortName</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor ExtendedShortName</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/F-class.html b/testing/test_package_docs/ex/F-class.html
index 9f8d30ad9c..a4f7361ae2 100644
--- a/testing/test_package_docs/ex/F-class.html
+++ b/testing/test_package_docs/ex/F-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class F<span class="signature">&lt;T extends String&gt;</span></li>
+    <li class="self-crumb">F<span class="signature">&lt;T extends String&gt;</span> class</li>
   </ol>
   <div class="self-name">F</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>F&lt;T extends String&gt; class</h1>
 
     
     <section>
@@ -368,7 +369,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class F</h5>
     <ol>
       <li class="section-title"><a href="ex/F-class.html#constructors">Constructors</a></li>
       <li><a href="ex/F/F.html">F</a></li>
diff --git a/testing/test_package_docs/ex/F/F.html b/testing/test_package_docs/ex/F/F.html
index 9657cd34f8..362fa5f4a6 100644
--- a/testing/test_package_docs/ex/F/F.html
+++ b/testing/test_package_docs/ex/F/F.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/F-class.html">F<span class="signature">&lt;T extends String&gt;</span></a></li>
-    <li class="self-crumb">constructor F</li>
+    <li class="self-crumb">F constructor</li>
   </ol>
   <div class="self-name">F</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class F</h5>
+    <h5>F class</h5>
     <ol>
       <li class="section-title"><a href="ex/F-class.html#constructors">Constructors</a></li>
       <li><a href="ex/F/F.html">F</a></li>
@@ -80,6 +80,8 @@ <h5>class F</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>F&lt;T extends String&gt; constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">F&lt;T extends String&gt;</span>(<wbr>)
@@ -91,7 +93,6 @@ <h5>class F</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor F</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/F/methodWithGenericParam.html b/testing/test_package_docs/ex/F/methodWithGenericParam.html
index 2b061637e4..f7743cbcab 100644
--- a/testing/test_package_docs/ex/F/methodWithGenericParam.html
+++ b/testing/test_package_docs/ex/F/methodWithGenericParam.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/F-class.html">F<span class="signature">&lt;T extends String&gt;</span></a></li>
-    <li class="self-crumb">method methodWithGenericParam</li>
+    <li class="self-crumb">methodWithGenericParam method</li>
   </ol>
   <div class="self-name">methodWithGenericParam</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class F</h5>
+    <h5>F class</h5>
     <ol>
       <li class="section-title"><a href="ex/F-class.html#constructors">Constructors</a></li>
       <li><a href="ex/F/F.html">F</a></li>
@@ -80,6 +80,8 @@ <h5>class F</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>methodWithGenericParam method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">methodWithGenericParam</span>(<wbr>[<span class="parameter" id="methodWithGenericParam-param-msgs"><span class="type-annotation">List<span class="signature">&lt;<a href="ex/Apple-class.html">Apple</a>&gt;</span></span> <span class="parameter-name">msgs</span></span> ])
@@ -90,7 +92,6 @@ <h5>class F</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method methodWithGenericParam</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/F/test.html b/testing/test_package_docs/ex/F/test.html
index 8cd35daa01..1376cef0d8 100644
--- a/testing/test_package_docs/ex/F/test.html
+++ b/testing/test_package_docs/ex/F/test.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/F-class.html">F<span class="signature">&lt;T extends String&gt;</span></a></li>
-    <li class="self-crumb">method test</li>
+    <li class="self-crumb">test method</li>
   </ol>
   <div class="self-name">test</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class F</h5>
+    <h5>F class</h5>
     <ol>
       <li class="section-title"><a href="ex/F-class.html#constructors">Constructors</a></li>
       <li><a href="ex/F/F.html">F</a></li>
@@ -80,6 +80,8 @@ <h5>class F</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>test method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">test</span>(<wbr>)
@@ -90,7 +92,6 @@ <h5>class F</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method test</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ForAnnotation-class.html b/testing/test_package_docs/ex/ForAnnotation-class.html
index bbcde34722..117081b9db 100644
--- a/testing/test_package_docs/ex/ForAnnotation-class.html
+++ b/testing/test_package_docs/ex/ForAnnotation-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class ForAnnotation</li>
+    <li class="self-crumb">ForAnnotation class</li>
   </ol>
   <div class="self-name">ForAnnotation</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ForAnnotation class</h1>
 
     
 
@@ -200,7 +201,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class ForAnnotation</h5>
     <ol>
       <li class="section-title"><a href="ex/ForAnnotation-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ForAnnotation/ForAnnotation.html">ForAnnotation</a></li>
diff --git a/testing/test_package_docs/ex/ForAnnotation/ForAnnotation.html b/testing/test_package_docs/ex/ForAnnotation/ForAnnotation.html
index b3120a1e1c..fa28ed9d52 100644
--- a/testing/test_package_docs/ex/ForAnnotation/ForAnnotation.html
+++ b/testing/test_package_docs/ex/ForAnnotation/ForAnnotation.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ForAnnotation-class.html">ForAnnotation</a></li>
-    <li class="self-crumb">const constructor ForAnnotation</li>
+    <li class="self-crumb">ForAnnotation const constructor</li>
   </ol>
   <div class="self-name">ForAnnotation</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ForAnnotation</h5>
+    <h5>ForAnnotation class</h5>
     <ol>
       <li class="section-title"><a href="ex/ForAnnotation-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ForAnnotation/ForAnnotation.html">ForAnnotation</a></li>
@@ -62,6 +62,8 @@ <h5>class ForAnnotation</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ForAnnotation constructor</h1>
+
     <section class="multi-line-signature">
       const
       <span class="name ">ForAnnotation</span>(<wbr><span class="parameter" id="-param-value"><span class="type-annotation">String</span> <span class="parameter-name">value</span></span>)
@@ -73,7 +75,6 @@ <h5>class ForAnnotation</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor ForAnnotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ForAnnotation/hashCode.html b/testing/test_package_docs/ex/ForAnnotation/hashCode.html
index 9f96790248..5c3411f1a9 100644
--- a/testing/test_package_docs/ex/ForAnnotation/hashCode.html
+++ b/testing/test_package_docs/ex/ForAnnotation/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ForAnnotation-class.html">ForAnnotation</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ForAnnotation</h5>
+    <h5>ForAnnotation class</h5>
     <ol>
       <li class="section-title"><a href="ex/ForAnnotation-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ForAnnotation/ForAnnotation.html">ForAnnotation</a></li>
@@ -62,6 +62,8 @@ <h5>class ForAnnotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class ForAnnotation</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ForAnnotation/noSuchMethod.html b/testing/test_package_docs/ex/ForAnnotation/noSuchMethod.html
index 4970a76ca3..550834abc8 100644
--- a/testing/test_package_docs/ex/ForAnnotation/noSuchMethod.html
+++ b/testing/test_package_docs/ex/ForAnnotation/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ForAnnotation-class.html">ForAnnotation</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ForAnnotation</h5>
+    <h5>ForAnnotation class</h5>
     <ol>
       <li class="section-title"><a href="ex/ForAnnotation-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ForAnnotation/ForAnnotation.html">ForAnnotation</a></li>
@@ -62,6 +62,8 @@ <h5>class ForAnnotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -72,7 +74,6 @@ <h5>class ForAnnotation</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ForAnnotation/operator_equals.html b/testing/test_package_docs/ex/ForAnnotation/operator_equals.html
index 1473674c15..69ac4254b0 100644
--- a/testing/test_package_docs/ex/ForAnnotation/operator_equals.html
+++ b/testing/test_package_docs/ex/ForAnnotation/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ForAnnotation-class.html">ForAnnotation</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ForAnnotation</h5>
+    <h5>ForAnnotation class</h5>
     <ol>
       <li class="section-title"><a href="ex/ForAnnotation-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ForAnnotation/ForAnnotation.html">ForAnnotation</a></li>
@@ -62,6 +62,8 @@ <h5>class ForAnnotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -72,7 +74,6 @@ <h5>class ForAnnotation</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ForAnnotation/runtimeType.html b/testing/test_package_docs/ex/ForAnnotation/runtimeType.html
index e558bd39d3..89f9f6c0d6 100644
--- a/testing/test_package_docs/ex/ForAnnotation/runtimeType.html
+++ b/testing/test_package_docs/ex/ForAnnotation/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ForAnnotation-class.html">ForAnnotation</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ForAnnotation</h5>
+    <h5>ForAnnotation class</h5>
     <ol>
       <li class="section-title"><a href="ex/ForAnnotation-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ForAnnotation/ForAnnotation.html">ForAnnotation</a></li>
@@ -62,6 +62,8 @@ <h5>class ForAnnotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class ForAnnotation</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ForAnnotation/toString.html b/testing/test_package_docs/ex/ForAnnotation/toString.html
index 152db51faf..a0bc1ed076 100644
--- a/testing/test_package_docs/ex/ForAnnotation/toString.html
+++ b/testing/test_package_docs/ex/ForAnnotation/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ForAnnotation-class.html">ForAnnotation</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ForAnnotation</h5>
+    <h5>ForAnnotation class</h5>
     <ol>
       <li class="section-title"><a href="ex/ForAnnotation-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ForAnnotation/ForAnnotation.html">ForAnnotation</a></li>
@@ -62,6 +62,8 @@ <h5>class ForAnnotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class ForAnnotation</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ForAnnotation/value.html b/testing/test_package_docs/ex/ForAnnotation/value.html
index 52ce265d69..59ba1c9684 100644
--- a/testing/test_package_docs/ex/ForAnnotation/value.html
+++ b/testing/test_package_docs/ex/ForAnnotation/value.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ForAnnotation-class.html">ForAnnotation</a></li>
-    <li class="self-crumb">property value</li>
+    <li class="self-crumb">value property</li>
   </ol>
   <div class="self-name">value</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ForAnnotation</h5>
+    <h5>ForAnnotation class</h5>
     <ol>
       <li class="section-title"><a href="ex/ForAnnotation-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ForAnnotation/ForAnnotation.html">ForAnnotation</a></li>
@@ -62,6 +62,8 @@ <h5>class ForAnnotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>value property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">String</span>
           <span class="name ">value</span>          <div class="features">final</div>
@@ -71,7 +73,6 @@ <h5>class ForAnnotation</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property value</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/HasAnnotation-class.html b/testing/test_package_docs/ex/HasAnnotation-class.html
index 0997a35a5a..fa38c65216 100644
--- a/testing/test_package_docs/ex/HasAnnotation-class.html
+++ b/testing/test_package_docs/ex/HasAnnotation-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class HasAnnotation</li>
+    <li class="self-crumb">HasAnnotation class</li>
   </ol>
   <div class="self-name">HasAnnotation</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>HasAnnotation class</h1>
 
     
     <section>
@@ -203,7 +204,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class HasAnnotation</h5>
     <ol>
       <li class="section-title"><a href="ex/HasAnnotation-class.html#constructors">Constructors</a></li>
       <li><a href="ex/HasAnnotation/HasAnnotation.html">HasAnnotation</a></li>
diff --git a/testing/test_package_docs/ex/HasAnnotation/HasAnnotation.html b/testing/test_package_docs/ex/HasAnnotation/HasAnnotation.html
index 5d10fa8f6d..0cbade0a22 100644
--- a/testing/test_package_docs/ex/HasAnnotation/HasAnnotation.html
+++ b/testing/test_package_docs/ex/HasAnnotation/HasAnnotation.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/HasAnnotation-class.html">HasAnnotation</a></li>
-    <li class="self-crumb">constructor HasAnnotation</li>
+    <li class="self-crumb">HasAnnotation constructor</li>
   </ol>
   <div class="self-name">HasAnnotation</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasAnnotation</h5>
+    <h5>HasAnnotation class</h5>
     <ol>
       <li class="section-title"><a href="ex/HasAnnotation-class.html#constructors">Constructors</a></li>
       <li><a href="ex/HasAnnotation/HasAnnotation.html">HasAnnotation</a></li>
@@ -61,6 +61,8 @@ <h5>class HasAnnotation</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>HasAnnotation constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">HasAnnotation</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class HasAnnotation</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor HasAnnotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/HasAnnotation/hashCode.html b/testing/test_package_docs/ex/HasAnnotation/hashCode.html
index d3d817a7a0..0038c28945 100644
--- a/testing/test_package_docs/ex/HasAnnotation/hashCode.html
+++ b/testing/test_package_docs/ex/HasAnnotation/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/HasAnnotation-class.html">HasAnnotation</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasAnnotation</h5>
+    <h5>HasAnnotation class</h5>
     <ol>
       <li class="section-title"><a href="ex/HasAnnotation-class.html#constructors">Constructors</a></li>
       <li><a href="ex/HasAnnotation/HasAnnotation.html">HasAnnotation</a></li>
@@ -61,6 +61,8 @@ <h5>class HasAnnotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class HasAnnotation</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/HasAnnotation/noSuchMethod.html b/testing/test_package_docs/ex/HasAnnotation/noSuchMethod.html
index d033843347..6430ca594f 100644
--- a/testing/test_package_docs/ex/HasAnnotation/noSuchMethod.html
+++ b/testing/test_package_docs/ex/HasAnnotation/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/HasAnnotation-class.html">HasAnnotation</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasAnnotation</h5>
+    <h5>HasAnnotation class</h5>
     <ol>
       <li class="section-title"><a href="ex/HasAnnotation-class.html#constructors">Constructors</a></li>
       <li><a href="ex/HasAnnotation/HasAnnotation.html">HasAnnotation</a></li>
@@ -61,6 +61,8 @@ <h5>class HasAnnotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -71,7 +73,6 @@ <h5>class HasAnnotation</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/HasAnnotation/operator_equals.html b/testing/test_package_docs/ex/HasAnnotation/operator_equals.html
index e0adcc94c6..70b80e422d 100644
--- a/testing/test_package_docs/ex/HasAnnotation/operator_equals.html
+++ b/testing/test_package_docs/ex/HasAnnotation/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/HasAnnotation-class.html">HasAnnotation</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasAnnotation</h5>
+    <h5>HasAnnotation class</h5>
     <ol>
       <li class="section-title"><a href="ex/HasAnnotation-class.html#constructors">Constructors</a></li>
       <li><a href="ex/HasAnnotation/HasAnnotation.html">HasAnnotation</a></li>
@@ -61,6 +61,8 @@ <h5>class HasAnnotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -71,7 +73,6 @@ <h5>class HasAnnotation</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/HasAnnotation/runtimeType.html b/testing/test_package_docs/ex/HasAnnotation/runtimeType.html
index 5c014fb563..78fba74748 100644
--- a/testing/test_package_docs/ex/HasAnnotation/runtimeType.html
+++ b/testing/test_package_docs/ex/HasAnnotation/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/HasAnnotation-class.html">HasAnnotation</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasAnnotation</h5>
+    <h5>HasAnnotation class</h5>
     <ol>
       <li class="section-title"><a href="ex/HasAnnotation-class.html#constructors">Constructors</a></li>
       <li><a href="ex/HasAnnotation/HasAnnotation.html">HasAnnotation</a></li>
@@ -61,6 +61,8 @@ <h5>class HasAnnotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class HasAnnotation</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/HasAnnotation/toString.html b/testing/test_package_docs/ex/HasAnnotation/toString.html
index 5cf5999aec..835c21683f 100644
--- a/testing/test_package_docs/ex/HasAnnotation/toString.html
+++ b/testing/test_package_docs/ex/HasAnnotation/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/HasAnnotation-class.html">HasAnnotation</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasAnnotation</h5>
+    <h5>HasAnnotation class</h5>
     <ol>
       <li class="section-title"><a href="ex/HasAnnotation-class.html#constructors">Constructors</a></li>
       <li><a href="ex/HasAnnotation/HasAnnotation.html">HasAnnotation</a></li>
@@ -61,6 +61,8 @@ <h5>class HasAnnotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -71,7 +73,6 @@ <h5>class HasAnnotation</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Helper-class.html b/testing/test_package_docs/ex/Helper-class.html
index cdb046177d..d4b36c2aa0 100644
--- a/testing/test_package_docs/ex/Helper-class.html
+++ b/testing/test_package_docs/ex/Helper-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class Helper</li>
+    <li class="self-crumb">Helper class</li>
   </ol>
   <div class="self-name">Helper</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Helper class</h1>
 
     <section class="desc markdown">
       <p>Even unresolved references in the same library should be resolved
@@ -205,7 +206,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class Helper</h5>
     <ol>
       <li class="section-title"><a href="ex/Helper-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Helper/Helper.html">Helper</a></li>
diff --git a/testing/test_package_docs/ex/Helper/Helper.html b/testing/test_package_docs/ex/Helper/Helper.html
index 6afed81458..c5f1d937dd 100644
--- a/testing/test_package_docs/ex/Helper/Helper.html
+++ b/testing/test_package_docs/ex/Helper/Helper.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Helper-class.html">Helper</a></li>
-    <li class="self-crumb">constructor Helper</li>
+    <li class="self-crumb">Helper constructor</li>
   </ol>
   <div class="self-name">Helper</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Helper</h5>
+    <h5>Helper class</h5>
     <ol>
       <li class="section-title"><a href="ex/Helper-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Helper/Helper.html">Helper</a></li>
@@ -62,6 +62,8 @@ <h5>class Helper</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Helper constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">Helper</span>(<wbr>)
@@ -73,7 +75,6 @@ <h5>class Helper</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor Helper</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Helper/getContents.html b/testing/test_package_docs/ex/Helper/getContents.html
index 55f9a105be..ad64852856 100644
--- a/testing/test_package_docs/ex/Helper/getContents.html
+++ b/testing/test_package_docs/ex/Helper/getContents.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Helper-class.html">Helper</a></li>
-    <li class="self-crumb">method getContents</li>
+    <li class="self-crumb">getContents method</li>
   </ol>
   <div class="self-name">getContents</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Helper</h5>
+    <h5>Helper class</h5>
     <ol>
       <li class="section-title"><a href="ex/Helper-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Helper/Helper.html">Helper</a></li>
@@ -62,6 +62,8 @@ <h5>class Helper</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>getContents method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">getContents</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class Helper</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method getContents</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Helper/hashCode.html b/testing/test_package_docs/ex/Helper/hashCode.html
index 8ecb61734e..735d6e3971 100644
--- a/testing/test_package_docs/ex/Helper/hashCode.html
+++ b/testing/test_package_docs/ex/Helper/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Helper-class.html">Helper</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Helper</h5>
+    <h5>Helper class</h5>
     <ol>
       <li class="section-title"><a href="ex/Helper-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Helper/Helper.html">Helper</a></li>
@@ -62,6 +62,8 @@ <h5>class Helper</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class Helper</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Helper/noSuchMethod.html b/testing/test_package_docs/ex/Helper/noSuchMethod.html
index fc0e297510..6dc4b5a02c 100644
--- a/testing/test_package_docs/ex/Helper/noSuchMethod.html
+++ b/testing/test_package_docs/ex/Helper/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Helper-class.html">Helper</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Helper</h5>
+    <h5>Helper class</h5>
     <ol>
       <li class="section-title"><a href="ex/Helper-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Helper/Helper.html">Helper</a></li>
@@ -62,6 +62,8 @@ <h5>class Helper</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -72,7 +74,6 @@ <h5>class Helper</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Helper/operator_equals.html b/testing/test_package_docs/ex/Helper/operator_equals.html
index 1a1a2bfea3..b476ac05bd 100644
--- a/testing/test_package_docs/ex/Helper/operator_equals.html
+++ b/testing/test_package_docs/ex/Helper/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Helper-class.html">Helper</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Helper</h5>
+    <h5>Helper class</h5>
     <ol>
       <li class="section-title"><a href="ex/Helper-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Helper/Helper.html">Helper</a></li>
@@ -62,6 +62,8 @@ <h5>class Helper</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -72,7 +74,6 @@ <h5>class Helper</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Helper/runtimeType.html b/testing/test_package_docs/ex/Helper/runtimeType.html
index 2695d02a58..236b4a362f 100644
--- a/testing/test_package_docs/ex/Helper/runtimeType.html
+++ b/testing/test_package_docs/ex/Helper/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Helper-class.html">Helper</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Helper</h5>
+    <h5>Helper class</h5>
     <ol>
       <li class="section-title"><a href="ex/Helper-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Helper/Helper.html">Helper</a></li>
@@ -62,6 +62,8 @@ <h5>class Helper</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class Helper</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Helper/toString.html b/testing/test_package_docs/ex/Helper/toString.html
index 25a0678e10..c9ee9b8fe8 100644
--- a/testing/test_package_docs/ex/Helper/toString.html
+++ b/testing/test_package_docs/ex/Helper/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Helper-class.html">Helper</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Helper</h5>
+    <h5>Helper class</h5>
     <ol>
       <li class="section-title"><a href="ex/Helper-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Helper/Helper.html">Helper</a></li>
@@ -62,6 +62,8 @@ <h5>class Helper</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class Helper</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Klass-class.html b/testing/test_package_docs/ex/Klass-class.html
index c4237ec796..44bea67184 100644
--- a/testing/test_package_docs/ex/Klass-class.html
+++ b/testing/test_package_docs/ex/Klass-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class Klass</li>
+    <li class="self-crumb">Klass class</li>
   </ol>
   <div class="self-name">Klass</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Klass class</h1>
 
     <section class="desc markdown">
       <p>A class</p>
@@ -239,7 +240,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class Klass</h5>
     <ol>
       <li class="section-title"><a href="ex/Klass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Klass/Klass.html">Klass</a></li>
diff --git a/testing/test_package_docs/ex/Klass/Klass.html b/testing/test_package_docs/ex/Klass/Klass.html
index 145310796a..9574432a27 100644
--- a/testing/test_package_docs/ex/Klass/Klass.html
+++ b/testing/test_package_docs/ex/Klass/Klass.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Klass-class.html">Klass</a></li>
-    <li class="self-crumb">constructor Klass</li>
+    <li class="self-crumb">Klass constructor</li>
   </ol>
   <div class="self-name">Klass</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Klass</h5>
+    <h5>Klass class</h5>
     <ol>
       <li class="section-title"><a href="ex/Klass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Klass/Klass.html">Klass</a></li>
@@ -66,6 +66,8 @@ <h5>class Klass</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Klass constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">Klass</span>(<wbr>)
@@ -77,7 +79,6 @@ <h5>class Klass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor Klass</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Klass/another.html b/testing/test_package_docs/ex/Klass/another.html
index ad5e346657..ed8d05e67b 100644
--- a/testing/test_package_docs/ex/Klass/another.html
+++ b/testing/test_package_docs/ex/Klass/another.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Klass-class.html">Klass</a></li>
-    <li class="self-crumb">method another</li>
+    <li class="self-crumb">another method</li>
   </ol>
   <div class="self-name">another</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Klass</h5>
+    <h5>Klass class</h5>
     <ol>
       <li class="section-title"><a href="ex/Klass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Klass/Klass.html">Klass</a></li>
@@ -66,6 +66,8 @@ <h5>class Klass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>another method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">another</span>(<wbr>)
@@ -79,7 +81,6 @@ <h5>class Klass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method another</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Klass/anotherMethod.html b/testing/test_package_docs/ex/Klass/anotherMethod.html
index 98d8e0ec53..180e5e856e 100644
--- a/testing/test_package_docs/ex/Klass/anotherMethod.html
+++ b/testing/test_package_docs/ex/Klass/anotherMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Klass-class.html">Klass</a></li>
-    <li class="self-crumb">method anotherMethod</li>
+    <li class="self-crumb">anotherMethod method</li>
   </ol>
   <div class="self-name">anotherMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Klass</h5>
+    <h5>Klass class</h5>
     <ol>
       <li class="section-title"><a href="ex/Klass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Klass/Klass.html">Klass</a></li>
@@ -66,6 +66,8 @@ <h5>class Klass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>anotherMethod method</h1>
+
     <section class="multi-line-signature">
       <div>
         <ol class="annotation-list">
@@ -84,7 +86,6 @@ <h5>class Klass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method anotherMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Klass/hashCode.html b/testing/test_package_docs/ex/Klass/hashCode.html
index d74d577a02..fd95a1d6c5 100644
--- a/testing/test_package_docs/ex/Klass/hashCode.html
+++ b/testing/test_package_docs/ex/Klass/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Klass-class.html">Klass</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Klass</h5>
+    <h5>Klass class</h5>
     <ol>
       <li class="section-title"><a href="ex/Klass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Klass/Klass.html">Klass</a></li>
@@ -66,6 +66,8 @@ <h5>class Klass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -80,7 +82,6 @@ <h5>class Klass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Klass/imAFactoryNoReally.html b/testing/test_package_docs/ex/Klass/imAFactoryNoReally.html
index e893f121fe..e68e7d8135 100644
--- a/testing/test_package_docs/ex/Klass/imAFactoryNoReally.html
+++ b/testing/test_package_docs/ex/Klass/imAFactoryNoReally.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Klass-class.html">Klass</a></li>
-    <li class="self-crumb">method imAFactoryNoReally</li>
+    <li class="self-crumb">imAFactoryNoReally method</li>
   </ol>
   <div class="self-name">imAFactoryNoReally</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Klass</h5>
+    <h5>Klass class</h5>
     <ol>
       <li class="section-title"><a href="ex/Klass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Klass/Klass.html">Klass</a></li>
@@ -66,6 +66,8 @@ <h5>class Klass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>imAFactoryNoReally method</h1>
+
     <section class="multi-line-signature">
       <div>
         <ol class="annotation-list">
@@ -84,7 +86,6 @@ <h5>class Klass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method imAFactoryNoReally</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Klass/imProtected.html b/testing/test_package_docs/ex/Klass/imProtected.html
index b9b727acc8..ae306b1811 100644
--- a/testing/test_package_docs/ex/Klass/imProtected.html
+++ b/testing/test_package_docs/ex/Klass/imProtected.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Klass-class.html">Klass</a></li>
-    <li class="self-crumb">method imProtected</li>
+    <li class="self-crumb">imProtected method</li>
   </ol>
   <div class="self-name">imProtected</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Klass</h5>
+    <h5>Klass class</h5>
     <ol>
       <li class="section-title"><a href="ex/Klass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Klass/Klass.html">Klass</a></li>
@@ -66,6 +66,8 @@ <h5>class Klass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>imProtected method</h1>
+
     <section class="multi-line-signature">
       <div>
         <ol class="annotation-list">
@@ -84,7 +86,6 @@ <h5>class Klass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method imProtected</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Klass/method.html b/testing/test_package_docs/ex/Klass/method.html
index 4c3a97a27e..4c175bcb8c 100644
--- a/testing/test_package_docs/ex/Klass/method.html
+++ b/testing/test_package_docs/ex/Klass/method.html
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Klass</h5>
+    <h5>Klass class</h5>
     <ol>
       <li class="section-title"><a href="ex/Klass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Klass/Klass.html">Klass</a></li>
@@ -66,6 +66,8 @@ <h5>class Klass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>method method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">method</span>(<wbr>)
@@ -79,7 +81,6 @@ <h5>class Klass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method method</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Klass/noSuchMethod.html b/testing/test_package_docs/ex/Klass/noSuchMethod.html
index 23c6e6beb0..f2143408b2 100644
--- a/testing/test_package_docs/ex/Klass/noSuchMethod.html
+++ b/testing/test_package_docs/ex/Klass/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Klass-class.html">Klass</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Klass</h5>
+    <h5>Klass class</h5>
     <ol>
       <li class="section-title"><a href="ex/Klass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Klass/Klass.html">Klass</a></li>
@@ -66,6 +66,8 @@ <h5>class Klass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -76,7 +78,6 @@ <h5>class Klass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Klass/operator_equals.html b/testing/test_package_docs/ex/Klass/operator_equals.html
index c56f2a74f9..de1fed4a7a 100644
--- a/testing/test_package_docs/ex/Klass/operator_equals.html
+++ b/testing/test_package_docs/ex/Klass/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Klass-class.html">Klass</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Klass</h5>
+    <h5>Klass class</h5>
     <ol>
       <li class="section-title"><a href="ex/Klass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Klass/Klass.html">Klass</a></li>
@@ -66,6 +66,8 @@ <h5>class Klass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -76,7 +78,6 @@ <h5>class Klass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Klass/runtimeType.html b/testing/test_package_docs/ex/Klass/runtimeType.html
index 1c41cafa50..1d7f060af0 100644
--- a/testing/test_package_docs/ex/Klass/runtimeType.html
+++ b/testing/test_package_docs/ex/Klass/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Klass-class.html">Klass</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Klass</h5>
+    <h5>Klass class</h5>
     <ol>
       <li class="section-title"><a href="ex/Klass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Klass/Klass.html">Klass</a></li>
@@ -66,6 +66,8 @@ <h5>class Klass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -80,7 +82,6 @@ <h5>class Klass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/Klass/toString.html b/testing/test_package_docs/ex/Klass/toString.html
index 6ee0e10045..4a2d7db812 100644
--- a/testing/test_package_docs/ex/Klass/toString.html
+++ b/testing/test_package_docs/ex/Klass/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Klass-class.html">Klass</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Klass</h5>
+    <h5>Klass class</h5>
     <ol>
       <li class="section-title"><a href="ex/Klass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/Klass/Klass.html">Klass</a></li>
@@ -66,6 +66,8 @@ <h5>class Klass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <div>
         <ol class="annotation-list">
@@ -84,7 +86,6 @@ <h5>class Klass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MY_CAT-constant.html b/testing/test_package_docs/ex/MY_CAT-constant.html
index 09a59ac3a1..dbc9227f57 100644
--- a/testing/test_package_docs/ex/MY_CAT-constant.html
+++ b/testing/test_package_docs/ex/MY_CAT-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">constant MY_CAT</li>
+    <li class="self-crumb">MY_CAT constant</li>
   </ol>
   <div class="self-name">MY_CAT</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>MY_CAT top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name ">MY_CAT</span>      =
@@ -119,7 +120,6 @@ <h5>library ex</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property MY_CAT</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyError-class.html b/testing/test_package_docs/ex/MyError-class.html
index 6a5a64e326..725299829f 100644
--- a/testing/test_package_docs/ex/MyError-class.html
+++ b/testing/test_package_docs/ex/MyError-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class MyError</li>
+    <li class="self-crumb">MyError class</li>
   </ol>
   <div class="self-name">MyError</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>MyError class</h1>
 
     
     <section>
@@ -213,7 +214,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class MyError</h5>
     <ol>
       <li class="section-title"><a href="ex/MyError-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyError/MyError.html">MyError</a></li>
diff --git a/testing/test_package_docs/ex/MyError/MyError.html b/testing/test_package_docs/ex/MyError/MyError.html
index 4e836374bd..df68932c2f 100644
--- a/testing/test_package_docs/ex/MyError/MyError.html
+++ b/testing/test_package_docs/ex/MyError/MyError.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyError-class.html">MyError</a></li>
-    <li class="self-crumb">constructor MyError</li>
+    <li class="self-crumb">MyError constructor</li>
   </ol>
   <div class="self-name">MyError</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyError</h5>
+    <h5>MyError class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyError-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyError/MyError.html">MyError</a></li>
@@ -62,6 +62,8 @@ <h5>class MyError</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>MyError constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">MyError</span>(<wbr>)
@@ -73,7 +75,6 @@ <h5>class MyError</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor MyError</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyError/hashCode.html b/testing/test_package_docs/ex/MyError/hashCode.html
index f876cd84bb..24a325cf06 100644
--- a/testing/test_package_docs/ex/MyError/hashCode.html
+++ b/testing/test_package_docs/ex/MyError/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyError-class.html">MyError</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyError</h5>
+    <h5>MyError class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyError-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyError/MyError.html">MyError</a></li>
@@ -62,6 +62,8 @@ <h5>class MyError</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class MyError</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyError/noSuchMethod.html b/testing/test_package_docs/ex/MyError/noSuchMethod.html
index 870d4f961e..e0107ed081 100644
--- a/testing/test_package_docs/ex/MyError/noSuchMethod.html
+++ b/testing/test_package_docs/ex/MyError/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyError-class.html">MyError</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyError</h5>
+    <h5>MyError class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyError-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyError/MyError.html">MyError</a></li>
@@ -62,6 +62,8 @@ <h5>class MyError</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -72,7 +74,6 @@ <h5>class MyError</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyError/operator_equals.html b/testing/test_package_docs/ex/MyError/operator_equals.html
index f7e8adaf26..6962569a29 100644
--- a/testing/test_package_docs/ex/MyError/operator_equals.html
+++ b/testing/test_package_docs/ex/MyError/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyError-class.html">MyError</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyError</h5>
+    <h5>MyError class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyError-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyError/MyError.html">MyError</a></li>
@@ -62,6 +62,8 @@ <h5>class MyError</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -72,7 +74,6 @@ <h5>class MyError</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyError/runtimeType.html b/testing/test_package_docs/ex/MyError/runtimeType.html
index 53665fa2aa..546a4f488f 100644
--- a/testing/test_package_docs/ex/MyError/runtimeType.html
+++ b/testing/test_package_docs/ex/MyError/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyError-class.html">MyError</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyError</h5>
+    <h5>MyError class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyError-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyError/MyError.html">MyError</a></li>
@@ -62,6 +62,8 @@ <h5>class MyError</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class MyError</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyError/stackTrace.html b/testing/test_package_docs/ex/MyError/stackTrace.html
index 9bb3b0ad92..4b74842e4d 100644
--- a/testing/test_package_docs/ex/MyError/stackTrace.html
+++ b/testing/test_package_docs/ex/MyError/stackTrace.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyError-class.html">MyError</a></li>
-    <li class="self-crumb">property stackTrace</li>
+    <li class="self-crumb">stackTrace property</li>
   </ol>
   <div class="self-name">stackTrace</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyError</h5>
+    <h5>MyError class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyError-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyError/MyError.html">MyError</a></li>
@@ -62,6 +62,8 @@ <h5>class MyError</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>stackTrace property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class MyError</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property stackTrace</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyError/toString.html b/testing/test_package_docs/ex/MyError/toString.html
index 7a410714c3..f8b8b5da5a 100644
--- a/testing/test_package_docs/ex/MyError/toString.html
+++ b/testing/test_package_docs/ex/MyError/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyError-class.html">MyError</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyError</h5>
+    <h5>MyError class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyError-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyError/MyError.html">MyError</a></li>
@@ -62,6 +62,8 @@ <h5>class MyError</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class MyError</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyErrorImplements-class.html b/testing/test_package_docs/ex/MyErrorImplements-class.html
index 8333aaa7d1..52f511a9c5 100644
--- a/testing/test_package_docs/ex/MyErrorImplements-class.html
+++ b/testing/test_package_docs/ex/MyErrorImplements-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class MyErrorImplements</li>
+    <li class="self-crumb">MyErrorImplements class</li>
   </ol>
   <div class="self-name">MyErrorImplements</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>MyErrorImplements class</h1>
 
     
     <section>
@@ -213,7 +214,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class MyErrorImplements</h5>
     <ol>
       <li class="section-title"><a href="ex/MyErrorImplements-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyErrorImplements/MyErrorImplements.html">MyErrorImplements</a></li>
diff --git a/testing/test_package_docs/ex/MyErrorImplements/MyErrorImplements.html b/testing/test_package_docs/ex/MyErrorImplements/MyErrorImplements.html
index 91d7d42da3..9fc843021e 100644
--- a/testing/test_package_docs/ex/MyErrorImplements/MyErrorImplements.html
+++ b/testing/test_package_docs/ex/MyErrorImplements/MyErrorImplements.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyErrorImplements-class.html">MyErrorImplements</a></li>
-    <li class="self-crumb">constructor MyErrorImplements</li>
+    <li class="self-crumb">MyErrorImplements constructor</li>
   </ol>
   <div class="self-name">MyErrorImplements</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyErrorImplements</h5>
+    <h5>MyErrorImplements class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyErrorImplements-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyErrorImplements/MyErrorImplements.html">MyErrorImplements</a></li>
@@ -62,6 +62,8 @@ <h5>class MyErrorImplements</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>MyErrorImplements constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">MyErrorImplements</span>(<wbr>)
@@ -73,7 +75,6 @@ <h5>class MyErrorImplements</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor MyErrorImplements</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyErrorImplements/hashCode.html b/testing/test_package_docs/ex/MyErrorImplements/hashCode.html
index 92656e83c7..615482869f 100644
--- a/testing/test_package_docs/ex/MyErrorImplements/hashCode.html
+++ b/testing/test_package_docs/ex/MyErrorImplements/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyErrorImplements-class.html">MyErrorImplements</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyErrorImplements</h5>
+    <h5>MyErrorImplements class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyErrorImplements-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyErrorImplements/MyErrorImplements.html">MyErrorImplements</a></li>
@@ -62,6 +62,8 @@ <h5>class MyErrorImplements</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class MyErrorImplements</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyErrorImplements/noSuchMethod.html b/testing/test_package_docs/ex/MyErrorImplements/noSuchMethod.html
index 4fccbda13a..6e9483e8c9 100644
--- a/testing/test_package_docs/ex/MyErrorImplements/noSuchMethod.html
+++ b/testing/test_package_docs/ex/MyErrorImplements/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyErrorImplements-class.html">MyErrorImplements</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyErrorImplements</h5>
+    <h5>MyErrorImplements class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyErrorImplements-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyErrorImplements/MyErrorImplements.html">MyErrorImplements</a></li>
@@ -62,6 +62,8 @@ <h5>class MyErrorImplements</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -72,7 +74,6 @@ <h5>class MyErrorImplements</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyErrorImplements/operator_equals.html b/testing/test_package_docs/ex/MyErrorImplements/operator_equals.html
index 04ceb3c90b..aa799b2919 100644
--- a/testing/test_package_docs/ex/MyErrorImplements/operator_equals.html
+++ b/testing/test_package_docs/ex/MyErrorImplements/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyErrorImplements-class.html">MyErrorImplements</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyErrorImplements</h5>
+    <h5>MyErrorImplements class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyErrorImplements-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyErrorImplements/MyErrorImplements.html">MyErrorImplements</a></li>
@@ -62,6 +62,8 @@ <h5>class MyErrorImplements</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -72,7 +74,6 @@ <h5>class MyErrorImplements</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyErrorImplements/runtimeType.html b/testing/test_package_docs/ex/MyErrorImplements/runtimeType.html
index e9a8a5e6f5..9cedfdbfd4 100644
--- a/testing/test_package_docs/ex/MyErrorImplements/runtimeType.html
+++ b/testing/test_package_docs/ex/MyErrorImplements/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyErrorImplements-class.html">MyErrorImplements</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyErrorImplements</h5>
+    <h5>MyErrorImplements class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyErrorImplements-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyErrorImplements/MyErrorImplements.html">MyErrorImplements</a></li>
@@ -62,6 +62,8 @@ <h5>class MyErrorImplements</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class MyErrorImplements</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyErrorImplements/stackTrace.html b/testing/test_package_docs/ex/MyErrorImplements/stackTrace.html
index dfe0247063..ad8f84e676 100644
--- a/testing/test_package_docs/ex/MyErrorImplements/stackTrace.html
+++ b/testing/test_package_docs/ex/MyErrorImplements/stackTrace.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyErrorImplements-class.html">MyErrorImplements</a></li>
-    <li class="self-crumb">property stackTrace</li>
+    <li class="self-crumb">stackTrace property</li>
   </ol>
   <div class="self-name">stackTrace</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyErrorImplements</h5>
+    <h5>MyErrorImplements class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyErrorImplements-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyErrorImplements/MyErrorImplements.html">MyErrorImplements</a></li>
@@ -62,6 +62,8 @@ <h5>class MyErrorImplements</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>stackTrace property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class MyErrorImplements</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property stackTrace</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyErrorImplements/toString.html b/testing/test_package_docs/ex/MyErrorImplements/toString.html
index f3edb97b61..8f083a60d6 100644
--- a/testing/test_package_docs/ex/MyErrorImplements/toString.html
+++ b/testing/test_package_docs/ex/MyErrorImplements/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyErrorImplements-class.html">MyErrorImplements</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyErrorImplements</h5>
+    <h5>MyErrorImplements class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyErrorImplements-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyErrorImplements/MyErrorImplements.html">MyErrorImplements</a></li>
@@ -62,6 +62,8 @@ <h5>class MyErrorImplements</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class MyErrorImplements</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyException-class.html b/testing/test_package_docs/ex/MyException-class.html
index 3d77ba8800..1c59b9ff1c 100644
--- a/testing/test_package_docs/ex/MyException-class.html
+++ b/testing/test_package_docs/ex/MyException-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class MyException</li>
+    <li class="self-crumb">MyException class</li>
   </ol>
   <div class="self-name">MyException</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>MyException class</h1>
 
     
     <section>
@@ -205,7 +206,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class MyException</h5>
     <ol>
       <li class="section-title"><a href="ex/MyException-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyException/MyException.html">MyException</a></li>
diff --git a/testing/test_package_docs/ex/MyException/MyException.html b/testing/test_package_docs/ex/MyException/MyException.html
index b33ee4f07c..1056c69568 100644
--- a/testing/test_package_docs/ex/MyException/MyException.html
+++ b/testing/test_package_docs/ex/MyException/MyException.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyException-class.html">MyException</a></li>
-    <li class="self-crumb">constructor MyException</li>
+    <li class="self-crumb">MyException constructor</li>
   </ol>
   <div class="self-name">MyException</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyException</h5>
+    <h5>MyException class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyException-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyException/MyException.html">MyException</a></li>
@@ -61,6 +61,8 @@ <h5>class MyException</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>MyException constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">MyException</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class MyException</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor MyException</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyException/hashCode.html b/testing/test_package_docs/ex/MyException/hashCode.html
index c23a0d85eb..a9dc25f66e 100644
--- a/testing/test_package_docs/ex/MyException/hashCode.html
+++ b/testing/test_package_docs/ex/MyException/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyException-class.html">MyException</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyException</h5>
+    <h5>MyException class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyException-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyException/MyException.html">MyException</a></li>
@@ -61,6 +61,8 @@ <h5>class MyException</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class MyException</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyException/noSuchMethod.html b/testing/test_package_docs/ex/MyException/noSuchMethod.html
index 0f0664247d..c3b72f6175 100644
--- a/testing/test_package_docs/ex/MyException/noSuchMethod.html
+++ b/testing/test_package_docs/ex/MyException/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyException-class.html">MyException</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyException</h5>
+    <h5>MyException class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyException-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyException/MyException.html">MyException</a></li>
@@ -61,6 +61,8 @@ <h5>class MyException</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -71,7 +73,6 @@ <h5>class MyException</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyException/operator_equals.html b/testing/test_package_docs/ex/MyException/operator_equals.html
index 6c183ca288..f5fd83bfcb 100644
--- a/testing/test_package_docs/ex/MyException/operator_equals.html
+++ b/testing/test_package_docs/ex/MyException/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyException-class.html">MyException</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyException</h5>
+    <h5>MyException class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyException-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyException/MyException.html">MyException</a></li>
@@ -61,6 +61,8 @@ <h5>class MyException</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -71,7 +73,6 @@ <h5>class MyException</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyException/runtimeType.html b/testing/test_package_docs/ex/MyException/runtimeType.html
index 3d02a3bc36..f75b856594 100644
--- a/testing/test_package_docs/ex/MyException/runtimeType.html
+++ b/testing/test_package_docs/ex/MyException/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyException-class.html">MyException</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyException</h5>
+    <h5>MyException class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyException-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyException/MyException.html">MyException</a></li>
@@ -61,6 +61,8 @@ <h5>class MyException</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class MyException</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyException/toString.html b/testing/test_package_docs/ex/MyException/toString.html
index 6992011050..569b3b1110 100644
--- a/testing/test_package_docs/ex/MyException/toString.html
+++ b/testing/test_package_docs/ex/MyException/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyException-class.html">MyException</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyException</h5>
+    <h5>MyException class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyException-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyException/MyException.html">MyException</a></li>
@@ -61,6 +61,8 @@ <h5>class MyException</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -71,7 +73,6 @@ <h5>class MyException</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyExceptionImplements-class.html b/testing/test_package_docs/ex/MyExceptionImplements-class.html
index a554570ea8..fa06d53346 100644
--- a/testing/test_package_docs/ex/MyExceptionImplements-class.html
+++ b/testing/test_package_docs/ex/MyExceptionImplements-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class MyExceptionImplements</li>
+    <li class="self-crumb">MyExceptionImplements class</li>
   </ol>
   <div class="self-name">MyExceptionImplements</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>MyExceptionImplements class</h1>
 
     
     <section>
@@ -205,7 +206,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class MyExceptionImplements</h5>
     <ol>
       <li class="section-title"><a href="ex/MyExceptionImplements-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyExceptionImplements/MyExceptionImplements.html">MyExceptionImplements</a></li>
diff --git a/testing/test_package_docs/ex/MyExceptionImplements/MyExceptionImplements.html b/testing/test_package_docs/ex/MyExceptionImplements/MyExceptionImplements.html
index e5ac46a80e..90f25b10d4 100644
--- a/testing/test_package_docs/ex/MyExceptionImplements/MyExceptionImplements.html
+++ b/testing/test_package_docs/ex/MyExceptionImplements/MyExceptionImplements.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyExceptionImplements-class.html">MyExceptionImplements</a></li>
-    <li class="self-crumb">constructor MyExceptionImplements</li>
+    <li class="self-crumb">MyExceptionImplements constructor</li>
   </ol>
   <div class="self-name">MyExceptionImplements</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyExceptionImplements</h5>
+    <h5>MyExceptionImplements class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyExceptionImplements-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyExceptionImplements/MyExceptionImplements.html">MyExceptionImplements</a></li>
@@ -61,6 +61,8 @@ <h5>class MyExceptionImplements</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>MyExceptionImplements constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">MyExceptionImplements</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class MyExceptionImplements</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor MyExceptionImplements</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyExceptionImplements/hashCode.html b/testing/test_package_docs/ex/MyExceptionImplements/hashCode.html
index 036c7ff6c8..62d8149508 100644
--- a/testing/test_package_docs/ex/MyExceptionImplements/hashCode.html
+++ b/testing/test_package_docs/ex/MyExceptionImplements/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyExceptionImplements-class.html">MyExceptionImplements</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyExceptionImplements</h5>
+    <h5>MyExceptionImplements class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyExceptionImplements-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyExceptionImplements/MyExceptionImplements.html">MyExceptionImplements</a></li>
@@ -61,6 +61,8 @@ <h5>class MyExceptionImplements</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class MyExceptionImplements</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyExceptionImplements/noSuchMethod.html b/testing/test_package_docs/ex/MyExceptionImplements/noSuchMethod.html
index 74dff15d92..713ba80ec5 100644
--- a/testing/test_package_docs/ex/MyExceptionImplements/noSuchMethod.html
+++ b/testing/test_package_docs/ex/MyExceptionImplements/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyExceptionImplements-class.html">MyExceptionImplements</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyExceptionImplements</h5>
+    <h5>MyExceptionImplements class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyExceptionImplements-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyExceptionImplements/MyExceptionImplements.html">MyExceptionImplements</a></li>
@@ -61,6 +61,8 @@ <h5>class MyExceptionImplements</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -71,7 +73,6 @@ <h5>class MyExceptionImplements</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyExceptionImplements/operator_equals.html b/testing/test_package_docs/ex/MyExceptionImplements/operator_equals.html
index fec07709bd..d24ecb5ce3 100644
--- a/testing/test_package_docs/ex/MyExceptionImplements/operator_equals.html
+++ b/testing/test_package_docs/ex/MyExceptionImplements/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyExceptionImplements-class.html">MyExceptionImplements</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyExceptionImplements</h5>
+    <h5>MyExceptionImplements class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyExceptionImplements-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyExceptionImplements/MyExceptionImplements.html">MyExceptionImplements</a></li>
@@ -61,6 +61,8 @@ <h5>class MyExceptionImplements</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -71,7 +73,6 @@ <h5>class MyExceptionImplements</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyExceptionImplements/runtimeType.html b/testing/test_package_docs/ex/MyExceptionImplements/runtimeType.html
index cb142e8854..833cc72418 100644
--- a/testing/test_package_docs/ex/MyExceptionImplements/runtimeType.html
+++ b/testing/test_package_docs/ex/MyExceptionImplements/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyExceptionImplements-class.html">MyExceptionImplements</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyExceptionImplements</h5>
+    <h5>MyExceptionImplements class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyExceptionImplements-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyExceptionImplements/MyExceptionImplements.html">MyExceptionImplements</a></li>
@@ -61,6 +61,8 @@ <h5>class MyExceptionImplements</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class MyExceptionImplements</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/MyExceptionImplements/toString.html b/testing/test_package_docs/ex/MyExceptionImplements/toString.html
index 6a4c24a8e3..a03fc72f34 100644
--- a/testing/test_package_docs/ex/MyExceptionImplements/toString.html
+++ b/testing/test_package_docs/ex/MyExceptionImplements/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/MyExceptionImplements-class.html">MyExceptionImplements</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MyExceptionImplements</h5>
+    <h5>MyExceptionImplements class</h5>
     <ol>
       <li class="section-title"><a href="ex/MyExceptionImplements-class.html#constructors">Constructors</a></li>
       <li><a href="ex/MyExceptionImplements/MyExceptionImplements.html">MyExceptionImplements</a></li>
@@ -61,6 +61,8 @@ <h5>class MyExceptionImplements</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -71,7 +73,6 @@ <h5>class MyExceptionImplements</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/PRETTY_COLORS-constant.html b/testing/test_package_docs/ex/PRETTY_COLORS-constant.html
index 494420e677..00f2eba058 100644
--- a/testing/test_package_docs/ex/PRETTY_COLORS-constant.html
+++ b/testing/test_package_docs/ex/PRETTY_COLORS-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">constant PRETTY_COLORS</li>
+    <li class="self-crumb">PRETTY_COLORS constant</li>
   </ol>
   <div class="self-name">PRETTY_COLORS</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>PRETTY_COLORS top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name ">PRETTY_COLORS</span>      =
@@ -119,7 +120,6 @@ <h5>library ex</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property PRETTY_COLORS</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ParameterizedClass-class.html b/testing/test_package_docs/ex/ParameterizedClass-class.html
index 79cf676e44..fa7ebc0659 100644
--- a/testing/test_package_docs/ex/ParameterizedClass-class.html
+++ b/testing/test_package_docs/ex/ParameterizedClass-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">abstract class ParameterizedClass<span class="signature">&lt;T&gt;</span></li>
+    <li class="self-crumb">ParameterizedClass<span class="signature">&lt;T&gt;</span> abstract class</li>
   </ol>
   <div class="self-name">ParameterizedClass</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ParameterizedClass&lt;T&gt; class</h1>
 
     <section class="desc markdown">
       <p>Support class to test inheritance + type expansion from implements clause.</p>
@@ -257,7 +258,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class ParameterizedClass</h5>
     <ol>
       <li class="section-title"><a href="ex/ParameterizedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ParameterizedClass/ParameterizedClass.html">ParameterizedClass</a></li>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/ParameterizedClass.html b/testing/test_package_docs/ex/ParameterizedClass/ParameterizedClass.html
index 9c26759132..a86edf2781 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/ParameterizedClass.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/ParameterizedClass.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">constructor ParameterizedClass</li>
+    <li class="self-crumb">ParameterizedClass constructor</li>
   </ol>
   <div class="self-name">ParameterizedClass</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ParameterizedClass</h5>
+    <h5>ParameterizedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/ParameterizedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ParameterizedClass/ParameterizedClass.html">ParameterizedClass</a></li>
@@ -67,6 +67,8 @@ <h5>class ParameterizedClass</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ParameterizedClass&lt;T&gt; constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">ParameterizedClass&lt;T&gt;</span>(<wbr>)
@@ -78,7 +80,6 @@ <h5>class ParameterizedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor ParameterizedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/aInheritedField.html b/testing/test_package_docs/ex/ParameterizedClass/aInheritedField.html
index 89b84357b2..6b7609c581 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/aInheritedField.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/aInheritedField.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">property aInheritedField</li>
+    <li class="self-crumb">aInheritedField property</li>
   </ol>
   <div class="self-name">aInheritedField</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ParameterizedClass</h5>
+    <h5>ParameterizedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/ParameterizedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ParameterizedClass/ParameterizedClass.html">ParameterizedClass</a></li>
@@ -67,6 +67,8 @@ <h5>class ParameterizedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aInheritedField property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;T&gt;</span></span>
           <span class="name ">aInheritedField</span>          <div class="features">read / write</div>
@@ -76,7 +78,6 @@ <h5>class ParameterizedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property aInheritedField</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/aInheritedGetter.html b/testing/test_package_docs/ex/ParameterizedClass/aInheritedGetter.html
index 22a45877fe..54cd88bf6e 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/aInheritedGetter.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/aInheritedGetter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">property aInheritedGetter</li>
+    <li class="self-crumb">aInheritedGetter property</li>
   </ol>
   <div class="self-name">aInheritedGetter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ParameterizedClass</h5>
+    <h5>ParameterizedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/ParameterizedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ParameterizedClass/ParameterizedClass.html">ParameterizedClass</a></li>
@@ -67,6 +67,8 @@ <h5>class ParameterizedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aInheritedGetter property</h1>
+
 
         <section id="getter">
         
@@ -81,7 +83,6 @@ <h5>class ParameterizedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property aInheritedGetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/aInheritedMethod.html b/testing/test_package_docs/ex/ParameterizedClass/aInheritedMethod.html
index aced2d07ef..bdfe58c54c 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/aInheritedMethod.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/aInheritedMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">abstract method aInheritedMethod</li>
+    <li class="self-crumb">aInheritedMethod abstract method</li>
   </ol>
   <div class="self-name">aInheritedMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ParameterizedClass</h5>
+    <h5>ParameterizedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/ParameterizedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ParameterizedClass/ParameterizedClass.html">ParameterizedClass</a></li>
@@ -67,6 +67,8 @@ <h5>class ParameterizedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aInheritedMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;T&gt;</span></span>
       <span class="name ">aInheritedMethod</span>(<wbr><span class="parameter" id="aInheritedMethod-param-foo"><span class="type-annotation">int</span> <span class="parameter-name">foo</span></span>)
@@ -77,7 +79,6 @@ <h5>class ParameterizedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method aInheritedMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/aInheritedSetter.html b/testing/test_package_docs/ex/ParameterizedClass/aInheritedSetter.html
index c0a9396c22..f4214a5127 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/aInheritedSetter.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/aInheritedSetter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">property aInheritedSetter</li>
+    <li class="self-crumb">aInheritedSetter property</li>
   </ol>
   <div class="self-name">aInheritedSetter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ParameterizedClass</h5>
+    <h5>ParameterizedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/ParameterizedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ParameterizedClass/ParameterizedClass.html">ParameterizedClass</a></li>
@@ -67,6 +67,8 @@ <h5>class ParameterizedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aInheritedSetter property</h1>
+
 
 
         <section id="setter">
@@ -82,7 +84,6 @@ <h5>class ParameterizedClass</h5>
           </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property aInheritedSetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/aInheritedTypedefReturningMethod.html b/testing/test_package_docs/ex/ParameterizedClass/aInheritedTypedefReturningMethod.html
index d506f620be..573b02fe52 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/aInheritedTypedefReturningMethod.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/aInheritedTypedefReturningMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">abstract method aInheritedTypedefReturningMethod</li>
+    <li class="self-crumb">aInheritedTypedefReturningMethod abstract method</li>
   </ol>
   <div class="self-name">aInheritedTypedefReturningMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ParameterizedClass</h5>
+    <h5>ParameterizedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/ParameterizedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ParameterizedClass/ParameterizedClass.html">ParameterizedClass</a></li>
@@ -67,6 +67,8 @@ <h5>class ParameterizedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aInheritedTypedefReturningMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;T&gt;</span></span>
       <span class="name ">aInheritedTypedefReturningMethod</span>(<wbr>)
@@ -77,7 +79,6 @@ <h5>class ParameterizedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method aInheritedTypedefReturningMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/hashCode.html b/testing/test_package_docs/ex/ParameterizedClass/hashCode.html
index c1d1df5649..e18c8941b4 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/hashCode.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ParameterizedClass</h5>
+    <h5>ParameterizedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/ParameterizedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ParameterizedClass/ParameterizedClass.html">ParameterizedClass</a></li>
@@ -67,6 +67,8 @@ <h5>class ParameterizedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -81,7 +83,6 @@ <h5>class ParameterizedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/noSuchMethod.html b/testing/test_package_docs/ex/ParameterizedClass/noSuchMethod.html
index b20d4bb063..690ebd8fa7 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/noSuchMethod.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ParameterizedClass</h5>
+    <h5>ParameterizedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/ParameterizedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ParameterizedClass/ParameterizedClass.html">ParameterizedClass</a></li>
@@ -67,6 +67,8 @@ <h5>class ParameterizedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -77,7 +79,6 @@ <h5>class ParameterizedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/operator_equals.html b/testing/test_package_docs/ex/ParameterizedClass/operator_equals.html
index ed049378eb..20ac79adcf 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/operator_equals.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ParameterizedClass</h5>
+    <h5>ParameterizedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/ParameterizedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ParameterizedClass/ParameterizedClass.html">ParameterizedClass</a></li>
@@ -67,6 +67,8 @@ <h5>class ParameterizedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -77,7 +79,6 @@ <h5>class ParameterizedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/operator_plus.html b/testing/test_package_docs/ex/ParameterizedClass/operator_plus.html
index 0d4a1c8f0c..3ef106c271 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/operator_plus.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/operator_plus.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">abstract method operator +</li>
+    <li class="self-crumb">operator + abstract method</li>
   </ol>
   <div class="self-name">operator +</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ParameterizedClass</h5>
+    <h5>ParameterizedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/ParameterizedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ParameterizedClass/ParameterizedClass.html">ParameterizedClass</a></li>
@@ -67,6 +67,8 @@ <h5>class ParameterizedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator + method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;T&gt;</span></span>
       <span class="name ">operator +</span>(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;T&gt;</span></span> <span class="parameter-name">other</span></span>)
@@ -77,7 +79,6 @@ <h5>class ParameterizedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator +</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/runtimeType.html b/testing/test_package_docs/ex/ParameterizedClass/runtimeType.html
index 41d83ee14c..fb920fb970 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/runtimeType.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ParameterizedClass</h5>
+    <h5>ParameterizedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/ParameterizedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ParameterizedClass/ParameterizedClass.html">ParameterizedClass</a></li>
@@ -67,6 +67,8 @@ <h5>class ParameterizedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -81,7 +83,6 @@ <h5>class ParameterizedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/toString.html b/testing/test_package_docs/ex/ParameterizedClass/toString.html
index 610dc0c8fa..7408d181c8 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/toString.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ParameterizedClass</h5>
+    <h5>ParameterizedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/ParameterizedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ParameterizedClass/ParameterizedClass.html">ParameterizedClass</a></li>
@@ -67,6 +67,8 @@ <h5>class ParameterizedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -77,7 +79,6 @@ <h5>class ParameterizedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ParameterizedTypedef.html b/testing/test_package_docs/ex/ParameterizedTypedef.html
index 8274e63cdc..67686dd7ee 100644
--- a/testing/test_package_docs/ex/ParameterizedTypedef.html
+++ b/testing/test_package_docs/ex/ParameterizedTypedef.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">typedef ParameterizedTypedef&lt;T&gt;</li>
+    <li class="self-crumb">ParameterizedTypedef&lt;T&gt; typedef</li>
   </ol>
   <div class="self-name">ParameterizedTypedef</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ParameterizedTypedef&lt;T&gt; typedef</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">String</span>
@@ -118,7 +119,6 @@ <h5>library ex</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>typedef ParameterizedTypedef</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass-class.html b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass-class.html
index 18cdb967a4..73c90f6b64 100644
--- a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass-class.html
+++ b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class PublicClassExtendsPrivateClass</li>
+    <li class="self-crumb">PublicClassExtendsPrivateClass class</li>
   </ol>
   <div class="self-name">PublicClassExtendsPrivateClass</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>PublicClassExtendsPrivateClass class</h1>
 
     
 
@@ -200,7 +201,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class PublicClassExtendsPrivateClass</h5>
     <ol>
       <li class="section-title"><a href="ex/PublicClassExtendsPrivateClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/PublicClassExtendsPrivateClass/PublicClassExtendsPrivateClass.html">PublicClassExtendsPrivateClass</a></li>
diff --git a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/PublicClassExtendsPrivateClass.html b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/PublicClassExtendsPrivateClass.html
index b5577a836f..dd6e2bc5cd 100644
--- a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/PublicClassExtendsPrivateClass.html
+++ b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/PublicClassExtendsPrivateClass.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/PublicClassExtendsPrivateClass-class.html">PublicClassExtendsPrivateClass</a></li>
-    <li class="self-crumb">constructor PublicClassExtendsPrivateClass</li>
+    <li class="self-crumb">PublicClassExtendsPrivateClass constructor</li>
   </ol>
   <div class="self-name">PublicClassExtendsPrivateClass</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class PublicClassExtendsPrivateClass</h5>
+    <h5>PublicClassExtendsPrivateClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/PublicClassExtendsPrivateClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/PublicClassExtendsPrivateClass/PublicClassExtendsPrivateClass.html">PublicClassExtendsPrivateClass</a></li>
@@ -62,6 +62,8 @@ <h5>class PublicClassExtendsPrivateClass</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>PublicClassExtendsPrivateClass constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">PublicClassExtendsPrivateClass</span>(<wbr>)
@@ -73,7 +75,6 @@ <h5>class PublicClassExtendsPrivateClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor PublicClassExtendsPrivateClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/hashCode.html b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/hashCode.html
index 80f7718299..85c4fe6299 100644
--- a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/hashCode.html
+++ b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/PublicClassExtendsPrivateClass-class.html">PublicClassExtendsPrivateClass</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class PublicClassExtendsPrivateClass</h5>
+    <h5>PublicClassExtendsPrivateClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/PublicClassExtendsPrivateClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/PublicClassExtendsPrivateClass/PublicClassExtendsPrivateClass.html">PublicClassExtendsPrivateClass</a></li>
@@ -62,6 +62,8 @@ <h5>class PublicClassExtendsPrivateClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class PublicClassExtendsPrivateClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/noSuchMethod.html b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/noSuchMethod.html
index d29819895c..51ad97f177 100644
--- a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/noSuchMethod.html
+++ b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/PublicClassExtendsPrivateClass-class.html">PublicClassExtendsPrivateClass</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class PublicClassExtendsPrivateClass</h5>
+    <h5>PublicClassExtendsPrivateClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/PublicClassExtendsPrivateClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/PublicClassExtendsPrivateClass/PublicClassExtendsPrivateClass.html">PublicClassExtendsPrivateClass</a></li>
@@ -62,6 +62,8 @@ <h5>class PublicClassExtendsPrivateClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -72,7 +74,6 @@ <h5>class PublicClassExtendsPrivateClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/operator_equals.html b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/operator_equals.html
index 065fbd7377..0996924da8 100644
--- a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/operator_equals.html
+++ b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/PublicClassExtendsPrivateClass-class.html">PublicClassExtendsPrivateClass</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class PublicClassExtendsPrivateClass</h5>
+    <h5>PublicClassExtendsPrivateClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/PublicClassExtendsPrivateClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/PublicClassExtendsPrivateClass/PublicClassExtendsPrivateClass.html">PublicClassExtendsPrivateClass</a></li>
@@ -62,6 +62,8 @@ <h5>class PublicClassExtendsPrivateClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -72,7 +74,6 @@ <h5>class PublicClassExtendsPrivateClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/runtimeType.html b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/runtimeType.html
index 40885593ea..875f3f9804 100644
--- a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/runtimeType.html
+++ b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/PublicClassExtendsPrivateClass-class.html">PublicClassExtendsPrivateClass</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class PublicClassExtendsPrivateClass</h5>
+    <h5>PublicClassExtendsPrivateClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/PublicClassExtendsPrivateClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/PublicClassExtendsPrivateClass/PublicClassExtendsPrivateClass.html">PublicClassExtendsPrivateClass</a></li>
@@ -62,6 +62,8 @@ <h5>class PublicClassExtendsPrivateClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class PublicClassExtendsPrivateClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/test.html b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/test.html
index c160dc79e2..53799057ce 100644
--- a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/test.html
+++ b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/test.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/PublicClassExtendsPrivateClass-class.html">PublicClassExtendsPrivateClass</a></li>
-    <li class="self-crumb">method test</li>
+    <li class="self-crumb">test method</li>
   </ol>
   <div class="self-name">test</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class PublicClassExtendsPrivateClass</h5>
+    <h5>PublicClassExtendsPrivateClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/PublicClassExtendsPrivateClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/PublicClassExtendsPrivateClass/PublicClassExtendsPrivateClass.html">PublicClassExtendsPrivateClass</a></li>
@@ -62,6 +62,8 @@ <h5>class PublicClassExtendsPrivateClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>test method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">test</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class PublicClassExtendsPrivateClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method test</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/toString.html b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/toString.html
index 481f0040e7..9dad83537d 100644
--- a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/toString.html
+++ b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/PublicClassExtendsPrivateClass-class.html">PublicClassExtendsPrivateClass</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class PublicClassExtendsPrivateClass</h5>
+    <h5>PublicClassExtendsPrivateClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/PublicClassExtendsPrivateClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/PublicClassExtendsPrivateClass/PublicClassExtendsPrivateClass.html">PublicClassExtendsPrivateClass</a></li>
@@ -62,6 +62,8 @@ <h5>class PublicClassExtendsPrivateClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class PublicClassExtendsPrivateClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface-class.html b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface-class.html
index ef44e33e86..b2f5c48f61 100644
--- a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface-class.html
+++ b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class PublicClassImplementsPrivateInterface</li>
+    <li class="self-crumb">PublicClassImplementsPrivateInterface class</li>
   </ol>
   <div class="self-name">PublicClassImplementsPrivateInterface</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>PublicClassImplementsPrivateInterface class</h1>
 
     
 
@@ -200,7 +201,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class PublicClassImplementsPrivateInterface</h5>
     <ol>
       <li class="section-title"><a href="ex/PublicClassImplementsPrivateInterface-class.html#constructors">Constructors</a></li>
       <li><a href="ex/PublicClassImplementsPrivateInterface/PublicClassImplementsPrivateInterface.html">PublicClassImplementsPrivateInterface</a></li>
diff --git a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/PublicClassImplementsPrivateInterface.html b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/PublicClassImplementsPrivateInterface.html
index 769aa089bf..59b9a1dafe 100644
--- a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/PublicClassImplementsPrivateInterface.html
+++ b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/PublicClassImplementsPrivateInterface.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/PublicClassImplementsPrivateInterface-class.html">PublicClassImplementsPrivateInterface</a></li>
-    <li class="self-crumb">constructor PublicClassImplementsPrivateInterface</li>
+    <li class="self-crumb">PublicClassImplementsPrivateInterface constructor</li>
   </ol>
   <div class="self-name">PublicClassImplementsPrivateInterface</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class PublicClassImplementsPrivateInterface</h5>
+    <h5>PublicClassImplementsPrivateInterface class</h5>
     <ol>
       <li class="section-title"><a href="ex/PublicClassImplementsPrivateInterface-class.html#constructors">Constructors</a></li>
       <li><a href="ex/PublicClassImplementsPrivateInterface/PublicClassImplementsPrivateInterface.html">PublicClassImplementsPrivateInterface</a></li>
@@ -62,6 +62,8 @@ <h5>class PublicClassImplementsPrivateInterface</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>PublicClassImplementsPrivateInterface constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">PublicClassImplementsPrivateInterface</span>(<wbr>)
@@ -73,7 +75,6 @@ <h5>class PublicClassImplementsPrivateInterface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor PublicClassImplementsPrivateInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/hashCode.html b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/hashCode.html
index 20cdffb489..712e211bda 100644
--- a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/hashCode.html
+++ b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/PublicClassImplementsPrivateInterface-class.html">PublicClassImplementsPrivateInterface</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class PublicClassImplementsPrivateInterface</h5>
+    <h5>PublicClassImplementsPrivateInterface class</h5>
     <ol>
       <li class="section-title"><a href="ex/PublicClassImplementsPrivateInterface-class.html#constructors">Constructors</a></li>
       <li><a href="ex/PublicClassImplementsPrivateInterface/PublicClassImplementsPrivateInterface.html">PublicClassImplementsPrivateInterface</a></li>
@@ -62,6 +62,8 @@ <h5>class PublicClassImplementsPrivateInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class PublicClassImplementsPrivateInterface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/noSuchMethod.html b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/noSuchMethod.html
index a838948531..ab886df467 100644
--- a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/noSuchMethod.html
+++ b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/PublicClassImplementsPrivateInterface-class.html">PublicClassImplementsPrivateInterface</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class PublicClassImplementsPrivateInterface</h5>
+    <h5>PublicClassImplementsPrivateInterface class</h5>
     <ol>
       <li class="section-title"><a href="ex/PublicClassImplementsPrivateInterface-class.html#constructors">Constructors</a></li>
       <li><a href="ex/PublicClassImplementsPrivateInterface/PublicClassImplementsPrivateInterface.html">PublicClassImplementsPrivateInterface</a></li>
@@ -62,6 +62,8 @@ <h5>class PublicClassImplementsPrivateInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -72,7 +74,6 @@ <h5>class PublicClassImplementsPrivateInterface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/operator_equals.html b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/operator_equals.html
index 06e4f741c0..04369956da 100644
--- a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/operator_equals.html
+++ b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/PublicClassImplementsPrivateInterface-class.html">PublicClassImplementsPrivateInterface</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class PublicClassImplementsPrivateInterface</h5>
+    <h5>PublicClassImplementsPrivateInterface class</h5>
     <ol>
       <li class="section-title"><a href="ex/PublicClassImplementsPrivateInterface-class.html#constructors">Constructors</a></li>
       <li><a href="ex/PublicClassImplementsPrivateInterface/PublicClassImplementsPrivateInterface.html">PublicClassImplementsPrivateInterface</a></li>
@@ -62,6 +62,8 @@ <h5>class PublicClassImplementsPrivateInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -72,7 +74,6 @@ <h5>class PublicClassImplementsPrivateInterface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/runtimeType.html b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/runtimeType.html
index d19215938c..7565cdd2d4 100644
--- a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/runtimeType.html
+++ b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/PublicClassImplementsPrivateInterface-class.html">PublicClassImplementsPrivateInterface</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class PublicClassImplementsPrivateInterface</h5>
+    <h5>PublicClassImplementsPrivateInterface class</h5>
     <ol>
       <li class="section-title"><a href="ex/PublicClassImplementsPrivateInterface-class.html#constructors">Constructors</a></li>
       <li><a href="ex/PublicClassImplementsPrivateInterface/PublicClassImplementsPrivateInterface.html">PublicClassImplementsPrivateInterface</a></li>
@@ -62,6 +62,8 @@ <h5>class PublicClassImplementsPrivateInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class PublicClassImplementsPrivateInterface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/test.html b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/test.html
index 384175880f..6c4c77b7bf 100644
--- a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/test.html
+++ b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/test.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/PublicClassImplementsPrivateInterface-class.html">PublicClassImplementsPrivateInterface</a></li>
-    <li class="self-crumb">method test</li>
+    <li class="self-crumb">test method</li>
   </ol>
   <div class="self-name">test</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class PublicClassImplementsPrivateInterface</h5>
+    <h5>PublicClassImplementsPrivateInterface class</h5>
     <ol>
       <li class="section-title"><a href="ex/PublicClassImplementsPrivateInterface-class.html#constructors">Constructors</a></li>
       <li><a href="ex/PublicClassImplementsPrivateInterface/PublicClassImplementsPrivateInterface.html">PublicClassImplementsPrivateInterface</a></li>
@@ -62,6 +62,8 @@ <h5>class PublicClassImplementsPrivateInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>test method</h1>
+
     <section class="multi-line-signature">
       <div>
         <ol class="annotation-list">
@@ -77,7 +79,6 @@ <h5>class PublicClassImplementsPrivateInterface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method test</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/toString.html b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/toString.html
index 193cb11404..f9c9fdf560 100644
--- a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/toString.html
+++ b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/PublicClassImplementsPrivateInterface-class.html">PublicClassImplementsPrivateInterface</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class PublicClassImplementsPrivateInterface</h5>
+    <h5>PublicClassImplementsPrivateInterface class</h5>
     <ol>
       <li class="section-title"><a href="ex/PublicClassImplementsPrivateInterface-class.html#constructors">Constructors</a></li>
       <li><a href="ex/PublicClassImplementsPrivateInterface/PublicClassImplementsPrivateInterface.html">PublicClassImplementsPrivateInterface</a></li>
@@ -62,6 +62,8 @@ <h5>class PublicClassImplementsPrivateInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class PublicClassImplementsPrivateInterface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ShapeType-class.html b/testing/test_package_docs/ex/ShapeType-class.html
index c997c0ae4e..4bfcf9306e 100644
--- a/testing/test_package_docs/ex/ShapeType-class.html
+++ b/testing/test_package_docs/ex/ShapeType-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class ShapeType</li>
+    <li class="self-crumb">ShapeType class</li>
   </ol>
   <div class="self-name">ShapeType</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ShapeType class</h1>
 
     <section class="desc markdown">
       <p>Foo bar.</p><ol start="3"><li>All references should be hyperlinks. <a href="ex/MyError-class.html">MyError</a> and
@@ -221,7 +222,6 @@ <h2>Constants</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class ShapeType</h5>
     <ol>
     
       <li class="section-title inherited">
diff --git a/testing/test_package_docs/ex/ShapeType/ellipse-constant.html b/testing/test_package_docs/ex/ShapeType/ellipse-constant.html
index f745eda8e0..d1a559d3b6 100644
--- a/testing/test_package_docs/ex/ShapeType/ellipse-constant.html
+++ b/testing/test_package_docs/ex/ShapeType/ellipse-constant.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ShapeType-class.html">ShapeType</a></li>
-    <li class="self-crumb">constant ellipse</li>
+    <li class="self-crumb">ellipse constant</li>
   </ol>
   <div class="self-name">ellipse</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ShapeType</h5>
+    <h5>ShapeType class</h5>
     <ol>
     
       <li class="section-title inherited">
@@ -63,6 +63,7 @@ <h5>class ShapeType</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ellipse property</h1>
 
     <section class="multi-line-signature">
         <span class="returntype"><a href="ex/ShapeType-class.html">ShapeType</a></span>
@@ -75,7 +76,6 @@ <h5>class ShapeType</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property ellipse</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ShapeType/hashCode.html b/testing/test_package_docs/ex/ShapeType/hashCode.html
index e67c12e6a1..e0f6c77d47 100644
--- a/testing/test_package_docs/ex/ShapeType/hashCode.html
+++ b/testing/test_package_docs/ex/ShapeType/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ShapeType-class.html">ShapeType</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ShapeType</h5>
+    <h5>ShapeType class</h5>
     <ol>
     
       <li class="section-title inherited">
@@ -63,6 +63,8 @@ <h5>class ShapeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -77,7 +79,6 @@ <h5>class ShapeType</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ShapeType/name.html b/testing/test_package_docs/ex/ShapeType/name.html
index fa3294ff16..b80a4aac4d 100644
--- a/testing/test_package_docs/ex/ShapeType/name.html
+++ b/testing/test_package_docs/ex/ShapeType/name.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ShapeType-class.html">ShapeType</a></li>
-    <li class="self-crumb">property name</li>
+    <li class="self-crumb">name property</li>
   </ol>
   <div class="self-name">name</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ShapeType</h5>
+    <h5>ShapeType class</h5>
     <ol>
     
       <li class="section-title inherited">
@@ -63,6 +63,8 @@ <h5>class ShapeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>name property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">String</span>
           <span class="name ">name</span>          <div class="features">final, inherited</div>
@@ -72,7 +74,6 @@ <h5>class ShapeType</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property name</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ShapeType/noSuchMethod.html b/testing/test_package_docs/ex/ShapeType/noSuchMethod.html
index 8bdfa0db89..1bc0fc2074 100644
--- a/testing/test_package_docs/ex/ShapeType/noSuchMethod.html
+++ b/testing/test_package_docs/ex/ShapeType/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ShapeType-class.html">ShapeType</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ShapeType</h5>
+    <h5>ShapeType class</h5>
     <ol>
     
       <li class="section-title inherited">
@@ -63,6 +63,8 @@ <h5>class ShapeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -73,7 +75,6 @@ <h5>class ShapeType</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ShapeType/operator_equals.html b/testing/test_package_docs/ex/ShapeType/operator_equals.html
index 3bd9b6427c..fe5a2c1fc3 100644
--- a/testing/test_package_docs/ex/ShapeType/operator_equals.html
+++ b/testing/test_package_docs/ex/ShapeType/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ShapeType-class.html">ShapeType</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ShapeType</h5>
+    <h5>ShapeType class</h5>
     <ol>
     
       <li class="section-title inherited">
@@ -63,6 +63,8 @@ <h5>class ShapeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -73,7 +75,6 @@ <h5>class ShapeType</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ShapeType/rect-constant.html b/testing/test_package_docs/ex/ShapeType/rect-constant.html
index 3295aca11c..b6831d48f9 100644
--- a/testing/test_package_docs/ex/ShapeType/rect-constant.html
+++ b/testing/test_package_docs/ex/ShapeType/rect-constant.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ShapeType-class.html">ShapeType</a></li>
-    <li class="self-crumb">constant rect</li>
+    <li class="self-crumb">rect constant</li>
   </ol>
   <div class="self-name">rect</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ShapeType</h5>
+    <h5>ShapeType class</h5>
     <ol>
     
       <li class="section-title inherited">
@@ -63,6 +63,7 @@ <h5>class ShapeType</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>rect property</h1>
 
     <section class="multi-line-signature">
         <span class="returntype"><a href="ex/ShapeType-class.html">ShapeType</a></span>
@@ -75,7 +76,6 @@ <h5>class ShapeType</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property rect</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ShapeType/runtimeType.html b/testing/test_package_docs/ex/ShapeType/runtimeType.html
index a36f06eaf5..16788585af 100644
--- a/testing/test_package_docs/ex/ShapeType/runtimeType.html
+++ b/testing/test_package_docs/ex/ShapeType/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ShapeType-class.html">ShapeType</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ShapeType</h5>
+    <h5>ShapeType class</h5>
     <ol>
     
       <li class="section-title inherited">
@@ -63,6 +63,8 @@ <h5>class ShapeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -77,7 +79,6 @@ <h5>class ShapeType</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ShapeType/toString.html b/testing/test_package_docs/ex/ShapeType/toString.html
index f425ed26cf..796555c725 100644
--- a/testing/test_package_docs/ex/ShapeType/toString.html
+++ b/testing/test_package_docs/ex/ShapeType/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ShapeType-class.html">ShapeType</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ShapeType</h5>
+    <h5>ShapeType class</h5>
     <ol>
     
       <li class="section-title inherited">
@@ -63,6 +63,8 @@ <h5>class ShapeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <div>
         <ol class="annotation-list">
@@ -78,7 +80,6 @@ <h5>class ShapeType</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ShortName-class.html b/testing/test_package_docs/ex/ShortName-class.html
index 67f4eeac1e..3b23fff2a0 100644
--- a/testing/test_package_docs/ex/ShortName-class.html
+++ b/testing/test_package_docs/ex/ShortName-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class ShortName</li>
+    <li class="self-crumb">ShortName class</li>
   </ol>
   <div class="self-name">ShortName</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ShortName class</h1>
 
     
     <section>
@@ -212,7 +213,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class ShortName</h5>
     <ol>
       <li class="section-title"><a href="ex/ShortName-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ShortName/ShortName.html">ShortName</a></li>
diff --git a/testing/test_package_docs/ex/ShortName/ShortName.html b/testing/test_package_docs/ex/ShortName/ShortName.html
index 3b1fcb70b2..97f36028c4 100644
--- a/testing/test_package_docs/ex/ShortName/ShortName.html
+++ b/testing/test_package_docs/ex/ShortName/ShortName.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ShortName-class.html">ShortName</a></li>
-    <li class="self-crumb">const constructor ShortName</li>
+    <li class="self-crumb">ShortName const constructor</li>
   </ol>
   <div class="self-name">ShortName</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ShortName</h5>
+    <h5>ShortName class</h5>
     <ol>
       <li class="section-title"><a href="ex/ShortName-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ShortName/ShortName.html">ShortName</a></li>
@@ -62,6 +62,8 @@ <h5>class ShortName</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ShortName constructor</h1>
+
     <section class="multi-line-signature">
       const
       <span class="name ">ShortName</span>(<wbr><span class="parameter" id="-param-aParameter"><span class="type-annotation">String</span> <span class="parameter-name">aParameter</span></span>)
@@ -73,7 +75,6 @@ <h5>class ShortName</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor ShortName</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ShortName/aParameter.html b/testing/test_package_docs/ex/ShortName/aParameter.html
index 58ade196e4..97d67fdb7a 100644
--- a/testing/test_package_docs/ex/ShortName/aParameter.html
+++ b/testing/test_package_docs/ex/ShortName/aParameter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ShortName-class.html">ShortName</a></li>
-    <li class="self-crumb">property aParameter</li>
+    <li class="self-crumb">aParameter property</li>
   </ol>
   <div class="self-name">aParameter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ShortName</h5>
+    <h5>ShortName class</h5>
     <ol>
       <li class="section-title"><a href="ex/ShortName-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ShortName/ShortName.html">ShortName</a></li>
@@ -62,6 +62,8 @@ <h5>class ShortName</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aParameter property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">String</span>
           <span class="name ">aParameter</span>          <div class="features">final</div>
@@ -71,7 +73,6 @@ <h5>class ShortName</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property aParameter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ShortName/hashCode.html b/testing/test_package_docs/ex/ShortName/hashCode.html
index a1ea70c035..3e1a49dbac 100644
--- a/testing/test_package_docs/ex/ShortName/hashCode.html
+++ b/testing/test_package_docs/ex/ShortName/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ShortName-class.html">ShortName</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ShortName</h5>
+    <h5>ShortName class</h5>
     <ol>
       <li class="section-title"><a href="ex/ShortName-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ShortName/ShortName.html">ShortName</a></li>
@@ -62,6 +62,8 @@ <h5>class ShortName</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class ShortName</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ShortName/noSuchMethod.html b/testing/test_package_docs/ex/ShortName/noSuchMethod.html
index 19acaeddc3..c4d9fe6a69 100644
--- a/testing/test_package_docs/ex/ShortName/noSuchMethod.html
+++ b/testing/test_package_docs/ex/ShortName/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ShortName-class.html">ShortName</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ShortName</h5>
+    <h5>ShortName class</h5>
     <ol>
       <li class="section-title"><a href="ex/ShortName-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ShortName/ShortName.html">ShortName</a></li>
@@ -62,6 +62,8 @@ <h5>class ShortName</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -72,7 +74,6 @@ <h5>class ShortName</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ShortName/operator_equals.html b/testing/test_package_docs/ex/ShortName/operator_equals.html
index ac838a3d97..4d803779b5 100644
--- a/testing/test_package_docs/ex/ShortName/operator_equals.html
+++ b/testing/test_package_docs/ex/ShortName/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ShortName-class.html">ShortName</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ShortName</h5>
+    <h5>ShortName class</h5>
     <ol>
       <li class="section-title"><a href="ex/ShortName-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ShortName/ShortName.html">ShortName</a></li>
@@ -62,6 +62,8 @@ <h5>class ShortName</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -72,7 +74,6 @@ <h5>class ShortName</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ShortName/runtimeType.html b/testing/test_package_docs/ex/ShortName/runtimeType.html
index 8ada896c0b..7d4c1f4479 100644
--- a/testing/test_package_docs/ex/ShortName/runtimeType.html
+++ b/testing/test_package_docs/ex/ShortName/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ShortName-class.html">ShortName</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ShortName</h5>
+    <h5>ShortName class</h5>
     <ol>
       <li class="section-title"><a href="ex/ShortName-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ShortName/ShortName.html">ShortName</a></li>
@@ -62,6 +62,8 @@ <h5>class ShortName</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class ShortName</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ShortName/toString.html b/testing/test_package_docs/ex/ShortName/toString.html
index 4e1ec3c654..f9570ea3c6 100644
--- a/testing/test_package_docs/ex/ShortName/toString.html
+++ b/testing/test_package_docs/ex/ShortName/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/ShortName-class.html">ShortName</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ShortName</h5>
+    <h5>ShortName class</h5>
     <ol>
       <li class="section-title"><a href="ex/ShortName-class.html#constructors">Constructors</a></li>
       <li><a href="ex/ShortName/ShortName.html">ShortName</a></li>
@@ -62,6 +62,8 @@ <h5>class ShortName</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class ShortName</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration-class.html b/testing/test_package_docs/ex/SpecializedDuration-class.html
index a3acfae78f..dc90d03121 100644
--- a/testing/test_package_docs/ex/SpecializedDuration-class.html
+++ b/testing/test_package_docs/ex/SpecializedDuration-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class SpecializedDuration</li>
+    <li class="self-crumb">SpecializedDuration class</li>
   </ol>
   <div class="self-name">SpecializedDuration</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>SpecializedDuration class</h1>
 
     <section class="desc markdown">
       <p>For testing a class that extends a class
@@ -364,7 +365,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class SpecializedDuration</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/SpecializedDuration.html b/testing/test_package_docs/ex/SpecializedDuration/SpecializedDuration.html
index 31cf5900cf..0560f006d8 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/SpecializedDuration.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/SpecializedDuration.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">constructor SpecializedDuration</li>
+    <li class="self-crumb">SpecializedDuration constructor</li>
   </ol>
   <div class="self-name">SpecializedDuration</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>SpecializedDuration constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">SpecializedDuration</span>(<wbr>)
@@ -90,7 +92,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/abs.html b/testing/test_package_docs/ex/SpecializedDuration/abs.html
index db472f12de..d4c7bb1dfb 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/abs.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/abs.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">method abs</li>
+    <li class="self-crumb">abs method</li>
   </ol>
   <div class="self-name">abs</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>abs method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Duration</span>
       <span class="name ">abs</span>(<wbr>)
@@ -89,7 +91,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method abs</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/compareTo.html b/testing/test_package_docs/ex/SpecializedDuration/compareTo.html
index 34f73e8a03..ffc6449db4 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/compareTo.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/compareTo.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">method compareTo</li>
+    <li class="self-crumb">compareTo method</li>
   </ol>
   <div class="self-name">compareTo</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>compareTo method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">int</span>
       <span class="name ">compareTo</span>(<wbr><span class="parameter" id="compareTo-param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
@@ -89,7 +91,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method compareTo</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/hashCode.html b/testing/test_package_docs/ex/SpecializedDuration/hashCode.html
index fd09eb2f83..c8cd9afed5 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/hashCode.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -93,7 +95,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/inDays.html b/testing/test_package_docs/ex/SpecializedDuration/inDays.html
index 8f7fbbdd93..7b1ce1a067 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/inDays.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/inDays.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">property inDays</li>
+    <li class="self-crumb">inDays property</li>
   </ol>
   <div class="self-name">inDays</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>inDays property</h1>
+
 
         <section id="getter">
         
@@ -93,7 +95,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property inDays</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/inHours.html b/testing/test_package_docs/ex/SpecializedDuration/inHours.html
index ba1ec5e9ec..b35844738a 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/inHours.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/inHours.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">property inHours</li>
+    <li class="self-crumb">inHours property</li>
   </ol>
   <div class="self-name">inHours</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>inHours property</h1>
+
 
         <section id="getter">
         
@@ -93,7 +95,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property inHours</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/inMicroseconds.html b/testing/test_package_docs/ex/SpecializedDuration/inMicroseconds.html
index 2e0678eebb..a9253b2f35 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/inMicroseconds.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/inMicroseconds.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">property inMicroseconds</li>
+    <li class="self-crumb">inMicroseconds property</li>
   </ol>
   <div class="self-name">inMicroseconds</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>inMicroseconds property</h1>
+
 
         <section id="getter">
         
@@ -93,7 +95,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property inMicroseconds</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/inMilliseconds.html b/testing/test_package_docs/ex/SpecializedDuration/inMilliseconds.html
index f1081f04f6..f9e319e93c 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/inMilliseconds.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/inMilliseconds.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">property inMilliseconds</li>
+    <li class="self-crumb">inMilliseconds property</li>
   </ol>
   <div class="self-name">inMilliseconds</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>inMilliseconds property</h1>
+
 
         <section id="getter">
         
@@ -93,7 +95,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property inMilliseconds</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/inMinutes.html b/testing/test_package_docs/ex/SpecializedDuration/inMinutes.html
index e7bf981bb5..49ef51efb8 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/inMinutes.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/inMinutes.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">property inMinutes</li>
+    <li class="self-crumb">inMinutes property</li>
   </ol>
   <div class="self-name">inMinutes</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>inMinutes property</h1>
+
 
         <section id="getter">
         
@@ -93,7 +95,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property inMinutes</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/inSeconds.html b/testing/test_package_docs/ex/SpecializedDuration/inSeconds.html
index b3493f7233..8692bd1b65 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/inSeconds.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/inSeconds.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">property inSeconds</li>
+    <li class="self-crumb">inSeconds property</li>
   </ol>
   <div class="self-name">inSeconds</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>inSeconds property</h1>
+
 
         <section id="getter">
         
@@ -93,7 +95,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property inSeconds</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/isNegative.html b/testing/test_package_docs/ex/SpecializedDuration/isNegative.html
index 91a15bc669..0640b79ad5 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/isNegative.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/isNegative.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">property isNegative</li>
+    <li class="self-crumb">isNegative property</li>
   </ol>
   <div class="self-name">isNegative</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>isNegative property</h1>
+
 
         <section id="getter">
         
@@ -93,7 +95,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property isNegative</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/noSuchMethod.html b/testing/test_package_docs/ex/SpecializedDuration/noSuchMethod.html
index 14a036c660..6e65926aca 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/noSuchMethod.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -89,7 +91,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/operator_equals.html b/testing/test_package_docs/ex/SpecializedDuration/operator_equals.html
index 01a9072524..d4c0ed00c4 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/operator_equals.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -89,7 +91,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/operator_greater.html b/testing/test_package_docs/ex/SpecializedDuration/operator_greater.html
index 2705a42fe1..9cf8018dfa 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/operator_greater.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/operator_greater.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">method operator ></li>
+    <li class="self-crumb">operator > method</li>
   </ol>
   <div class="self-name">operator &gt;</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator > method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator &gt;</span>(<wbr><span class="parameter" id=">-param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
@@ -89,7 +91,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator &gt;</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/operator_greater_equal.html b/testing/test_package_docs/ex/SpecializedDuration/operator_greater_equal.html
index 362679ef37..7711ee6d64 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/operator_greater_equal.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/operator_greater_equal.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">method operator >=</li>
+    <li class="self-crumb">operator >= method</li>
   </ol>
   <div class="self-name">operator &gt;=</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator >= method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator &gt;=</span>(<wbr><span class="parameter" id=">=-param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
@@ -89,7 +91,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator &gt;=</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/operator_less.html b/testing/test_package_docs/ex/SpecializedDuration/operator_less.html
index 6c09135d87..1a50fc106a 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/operator_less.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/operator_less.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">method operator <</li>
+    <li class="self-crumb">operator < method</li>
   </ol>
   <div class="self-name">operator &lt;</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator < method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator &lt;</span>(<wbr><span class="parameter" id="<-param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
@@ -89,7 +91,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator &lt;</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/operator_less_equal.html b/testing/test_package_docs/ex/SpecializedDuration/operator_less_equal.html
index b0000c8e6f..b40b76c770 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/operator_less_equal.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/operator_less_equal.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">method operator <=</li>
+    <li class="self-crumb">operator <= method</li>
   </ol>
   <div class="self-name">operator &lt;=</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator <= method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator &lt;=</span>(<wbr><span class="parameter" id="<=-param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
@@ -89,7 +91,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator &lt;=</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/operator_minus.html b/testing/test_package_docs/ex/SpecializedDuration/operator_minus.html
index d297c2ceb6..56fe9d8634 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/operator_minus.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/operator_minus.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">method operator -</li>
+    <li class="self-crumb">operator - method</li>
   </ol>
   <div class="self-name">operator -</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator - method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Duration</span>
       <span class="name ">operator -</span>(<wbr><span class="parameter" id="--param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
@@ -89,7 +91,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator -</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/operator_multiply.html b/testing/test_package_docs/ex/SpecializedDuration/operator_multiply.html
index 7f5f9c1e73..68a40111b6 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/operator_multiply.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/operator_multiply.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">method operator *</li>
+    <li class="self-crumb">operator * method</li>
   </ol>
   <div class="self-name">operator *</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator * method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Duration</span>
       <span class="name ">operator *</span>(<wbr><span class="parameter" id="*-param-factor"><span class="type-annotation">num</span> <span class="parameter-name">factor</span></span>)
@@ -89,7 +91,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator *</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/operator_plus.html b/testing/test_package_docs/ex/SpecializedDuration/operator_plus.html
index 1e247e6434..6be545b46f 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/operator_plus.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/operator_plus.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">method operator +</li>
+    <li class="self-crumb">operator + method</li>
   </ol>
   <div class="self-name">operator +</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator + method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Duration</span>
       <span class="name ">operator +</span>(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
@@ -89,7 +91,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator +</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/operator_truncate_divide.html b/testing/test_package_docs/ex/SpecializedDuration/operator_truncate_divide.html
index ea0a865bd4..9bc27a8bda 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/operator_truncate_divide.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/operator_truncate_divide.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">method operator ~/</li>
+    <li class="self-crumb">operator ~/ method</li>
   </ol>
   <div class="self-name">operator ~/</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator ~/ method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Duration</span>
       <span class="name ">operator ~/</span>(<wbr><span class="parameter" id="~/-param-quotient"><span class="type-annotation">int</span> <span class="parameter-name">quotient</span></span>)
@@ -89,7 +91,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ~/</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/operator_unary_minus.html b/testing/test_package_docs/ex/SpecializedDuration/operator_unary_minus.html
index 6ea4542846..6116b5cb8b 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/operator_unary_minus.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/operator_unary_minus.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">method operator unary-</li>
+    <li class="self-crumb">operator unary- method</li>
   </ol>
   <div class="self-name">operator unary-</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator unary- method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Duration</span>
       <span class="name ">operator unary-</span>(<wbr>)
@@ -89,7 +91,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator unary-</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/runtimeType.html b/testing/test_package_docs/ex/SpecializedDuration/runtimeType.html
index 9cf045ef9f..cff0b88137 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/runtimeType.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -93,7 +95,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/SpecializedDuration/toString.html b/testing/test_package_docs/ex/SpecializedDuration/toString.html
index 66a92f51ed..0d31a411c1 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/toString.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecializedDuration</h5>
+    <h5>SpecializedDuration class</h5>
     <ol>
       <li class="section-title"><a href="ex/SpecializedDuration-class.html#constructors">Constructors</a></li>
       <li><a href="ex/SpecializedDuration/SpecializedDuration.html">SpecializedDuration</a></li>
@@ -79,6 +79,8 @@ <h5>class SpecializedDuration</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -89,7 +91,6 @@ <h5>class SpecializedDuration</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TemplatedClass-class.html b/testing/test_package_docs/ex/TemplatedClass-class.html
index 818bc69288..b965ca66d0 100644
--- a/testing/test_package_docs/ex/TemplatedClass-class.html
+++ b/testing/test_package_docs/ex/TemplatedClass-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class TemplatedClass<span class="signature">&lt;X&gt;</span></li>
+    <li class="self-crumb">TemplatedClass<span class="signature">&lt;X&gt;</span> class</li>
   </ol>
   <div class="self-name">TemplatedClass</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>TemplatedClass&lt;X&gt; class</h1>
 
     
 
@@ -200,7 +201,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class TemplatedClass</h5>
     <ol>
       <li class="section-title"><a href="ex/TemplatedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TemplatedClass/TemplatedClass.html">TemplatedClass</a></li>
diff --git a/testing/test_package_docs/ex/TemplatedClass/TemplatedClass.html b/testing/test_package_docs/ex/TemplatedClass/TemplatedClass.html
index 1765d68427..7a83c7f891 100644
--- a/testing/test_package_docs/ex/TemplatedClass/TemplatedClass.html
+++ b/testing/test_package_docs/ex/TemplatedClass/TemplatedClass.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
-    <li class="self-crumb">constructor TemplatedClass</li>
+    <li class="self-crumb">TemplatedClass constructor</li>
   </ol>
   <div class="self-name">TemplatedClass</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TemplatedClass</h5>
+    <h5>TemplatedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/TemplatedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TemplatedClass/TemplatedClass.html">TemplatedClass</a></li>
@@ -62,6 +62,8 @@ <h5>class TemplatedClass</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>TemplatedClass&lt;X&gt; constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">TemplatedClass&lt;X&gt;</span>(<wbr>)
@@ -73,7 +75,6 @@ <h5>class TemplatedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor TemplatedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TemplatedClass/aMethod.html b/testing/test_package_docs/ex/TemplatedClass/aMethod.html
index 8be67840a7..c1788bdd12 100644
--- a/testing/test_package_docs/ex/TemplatedClass/aMethod.html
+++ b/testing/test_package_docs/ex/TemplatedClass/aMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
-    <li class="self-crumb">method aMethod</li>
+    <li class="self-crumb">aMethod method</li>
   </ol>
   <div class="self-name">aMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TemplatedClass</h5>
+    <h5>TemplatedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/TemplatedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TemplatedClass/TemplatedClass.html">TemplatedClass</a></li>
@@ -62,6 +62,8 @@ <h5>class TemplatedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">int</span>
       <span class="name ">aMethod</span>(<wbr><span class="parameter" id="aMethod-param-input"><span class="type-annotation">X</span> <span class="parameter-name">input</span></span>)
@@ -72,7 +74,6 @@ <h5>class TemplatedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method aMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TemplatedClass/hashCode.html b/testing/test_package_docs/ex/TemplatedClass/hashCode.html
index 5e934d8878..cf246b34f6 100644
--- a/testing/test_package_docs/ex/TemplatedClass/hashCode.html
+++ b/testing/test_package_docs/ex/TemplatedClass/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TemplatedClass</h5>
+    <h5>TemplatedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/TemplatedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TemplatedClass/TemplatedClass.html">TemplatedClass</a></li>
@@ -62,6 +62,8 @@ <h5>class TemplatedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class TemplatedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TemplatedClass/noSuchMethod.html b/testing/test_package_docs/ex/TemplatedClass/noSuchMethod.html
index c52f1e4c3c..43444b0859 100644
--- a/testing/test_package_docs/ex/TemplatedClass/noSuchMethod.html
+++ b/testing/test_package_docs/ex/TemplatedClass/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TemplatedClass</h5>
+    <h5>TemplatedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/TemplatedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TemplatedClass/TemplatedClass.html">TemplatedClass</a></li>
@@ -62,6 +62,8 @@ <h5>class TemplatedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -72,7 +74,6 @@ <h5>class TemplatedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TemplatedClass/operator_equals.html b/testing/test_package_docs/ex/TemplatedClass/operator_equals.html
index d3133b0d11..aac6e6560e 100644
--- a/testing/test_package_docs/ex/TemplatedClass/operator_equals.html
+++ b/testing/test_package_docs/ex/TemplatedClass/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TemplatedClass</h5>
+    <h5>TemplatedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/TemplatedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TemplatedClass/TemplatedClass.html">TemplatedClass</a></li>
@@ -62,6 +62,8 @@ <h5>class TemplatedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -72,7 +74,6 @@ <h5>class TemplatedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TemplatedClass/runtimeType.html b/testing/test_package_docs/ex/TemplatedClass/runtimeType.html
index 9cbf08b1aa..d87b9d8932 100644
--- a/testing/test_package_docs/ex/TemplatedClass/runtimeType.html
+++ b/testing/test_package_docs/ex/TemplatedClass/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TemplatedClass</h5>
+    <h5>TemplatedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/TemplatedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TemplatedClass/TemplatedClass.html">TemplatedClass</a></li>
@@ -62,6 +62,8 @@ <h5>class TemplatedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class TemplatedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TemplatedClass/toString.html b/testing/test_package_docs/ex/TemplatedClass/toString.html
index 505589d97b..ffdaf20718 100644
--- a/testing/test_package_docs/ex/TemplatedClass/toString.html
+++ b/testing/test_package_docs/ex/TemplatedClass/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TemplatedClass</h5>
+    <h5>TemplatedClass class</h5>
     <ol>
       <li class="section-title"><a href="ex/TemplatedClass-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TemplatedClass/TemplatedClass.html">TemplatedClass</a></li>
@@ -62,6 +62,8 @@ <h5>class TemplatedClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class TemplatedClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TemplatedInterface-class.html b/testing/test_package_docs/ex/TemplatedInterface-class.html
index 3e4da70870..b945d07a7c 100644
--- a/testing/test_package_docs/ex/TemplatedInterface-class.html
+++ b/testing/test_package_docs/ex/TemplatedInterface-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">abstract class TemplatedInterface<span class="signature">&lt;A&gt;</span></li>
+    <li class="self-crumb">TemplatedInterface<span class="signature">&lt;A&gt;</span> abstract class</li>
   </ol>
   <div class="self-name">TemplatedInterface</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>TemplatedInterface&lt;A&gt; class</h1>
 
     <section class="desc markdown">
       <p>Class for testing expansion of type from implements clause.</p>
@@ -301,7 +302,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class TemplatedInterface</h5>
     <ol>
       <li class="section-title"><a href="ex/TemplatedInterface-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TemplatedInterface/TemplatedInterface.html">TemplatedInterface</a></li>
diff --git a/testing/test_package_docs/ex/TemplatedInterface/TemplatedInterface.html b/testing/test_package_docs/ex/TemplatedInterface/TemplatedInterface.html
index 5b5de7db9d..68284848be 100644
--- a/testing/test_package_docs/ex/TemplatedInterface/TemplatedInterface.html
+++ b/testing/test_package_docs/ex/TemplatedInterface/TemplatedInterface.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;A&gt;</span></a></li>
-    <li class="self-crumb">constructor TemplatedInterface</li>
+    <li class="self-crumb">TemplatedInterface constructor</li>
   </ol>
   <div class="self-name">TemplatedInterface</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TemplatedInterface</h5>
+    <h5>TemplatedInterface class</h5>
     <ol>
       <li class="section-title"><a href="ex/TemplatedInterface-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TemplatedInterface/TemplatedInterface.html">TemplatedInterface</a></li>
@@ -72,6 +72,8 @@ <h5>class TemplatedInterface</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>TemplatedInterface&lt;A&gt; constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">TemplatedInterface&lt;A&gt;</span>(<wbr>)
@@ -83,7 +85,6 @@ <h5>class TemplatedInterface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor TemplatedInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TemplatedInterface/aField.html b/testing/test_package_docs/ex/TemplatedInterface/aField.html
index a9027ac3e3..2c262d4f2e 100644
--- a/testing/test_package_docs/ex/TemplatedInterface/aField.html
+++ b/testing/test_package_docs/ex/TemplatedInterface/aField.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;A&gt;</span></a></li>
-    <li class="self-crumb">property aField</li>
+    <li class="self-crumb">aField property</li>
   </ol>
   <div class="self-name">aField</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TemplatedInterface</h5>
+    <h5>TemplatedInterface class</h5>
     <ol>
       <li class="section-title"><a href="ex/TemplatedInterface-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TemplatedInterface/TemplatedInterface.html">TemplatedInterface</a></li>
@@ -72,6 +72,8 @@ <h5>class TemplatedInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aField property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;Stream<span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span>&gt;</span></span>
           <span class="name ">aField</span>          <div class="features">read / write</div>
@@ -81,7 +83,6 @@ <h5>class TemplatedInterface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property aField</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TemplatedInterface/aGetter.html b/testing/test_package_docs/ex/TemplatedInterface/aGetter.html
index e249ca4216..df9ad3416b 100644
--- a/testing/test_package_docs/ex/TemplatedInterface/aGetter.html
+++ b/testing/test_package_docs/ex/TemplatedInterface/aGetter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;A&gt;</span></a></li>
-    <li class="self-crumb">property aGetter</li>
+    <li class="self-crumb">aGetter property</li>
   </ol>
   <div class="self-name">aGetter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TemplatedInterface</h5>
+    <h5>TemplatedInterface class</h5>
     <ol>
       <li class="section-title"><a href="ex/TemplatedInterface-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TemplatedInterface/TemplatedInterface.html">TemplatedInterface</a></li>
@@ -72,6 +72,8 @@ <h5>class TemplatedInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aGetter property</h1>
+
 
         <section id="getter">
         
@@ -86,7 +88,6 @@ <h5>class TemplatedInterface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property aGetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TemplatedInterface/aMethodInterface.html b/testing/test_package_docs/ex/TemplatedInterface/aMethodInterface.html
index 927925a49a..6862a6e022 100644
--- a/testing/test_package_docs/ex/TemplatedInterface/aMethodInterface.html
+++ b/testing/test_package_docs/ex/TemplatedInterface/aMethodInterface.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;A&gt;</span></a></li>
-    <li class="self-crumb">abstract method aMethodInterface</li>
+    <li class="self-crumb">aMethodInterface abstract method</li>
   </ol>
   <div class="self-name">aMethodInterface</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TemplatedInterface</h5>
+    <h5>TemplatedInterface class</h5>
     <ol>
       <li class="section-title"><a href="ex/TemplatedInterface-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TemplatedInterface/TemplatedInterface.html">TemplatedInterface</a></li>
@@ -72,6 +72,8 @@ <h5>class TemplatedInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aMethodInterface method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span></span>
       <span class="name ">aMethodInterface</span>(<wbr><span class="parameter" id="aMethodInterface-param-value"><span class="type-annotation">A</span> <span class="parameter-name">value</span></span>)
@@ -82,7 +84,6 @@ <h5>class TemplatedInterface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method aMethodInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TemplatedInterface/aSetter.html b/testing/test_package_docs/ex/TemplatedInterface/aSetter.html
index 76cb7e83cf..2b3a5739ad 100644
--- a/testing/test_package_docs/ex/TemplatedInterface/aSetter.html
+++ b/testing/test_package_docs/ex/TemplatedInterface/aSetter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;A&gt;</span></a></li>
-    <li class="self-crumb">property aSetter</li>
+    <li class="self-crumb">aSetter property</li>
   </ol>
   <div class="self-name">aSetter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TemplatedInterface</h5>
+    <h5>TemplatedInterface class</h5>
     <ol>
       <li class="section-title"><a href="ex/TemplatedInterface-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TemplatedInterface/TemplatedInterface.html">TemplatedInterface</a></li>
@@ -72,6 +72,8 @@ <h5>class TemplatedInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aSetter property</h1>
+
 
 
         <section id="setter">
@@ -87,7 +89,6 @@ <h5>class TemplatedInterface</h5>
           </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property aSetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TemplatedInterface/aTypedefReturningMethodInterface.html b/testing/test_package_docs/ex/TemplatedInterface/aTypedefReturningMethodInterface.html
index 0c003eefe4..5ea6dcfc1c 100644
--- a/testing/test_package_docs/ex/TemplatedInterface/aTypedefReturningMethodInterface.html
+++ b/testing/test_package_docs/ex/TemplatedInterface/aTypedefReturningMethodInterface.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;A&gt;</span></a></li>
-    <li class="self-crumb">abstract method aTypedefReturningMethodInterface</li>
+    <li class="self-crumb">aTypedefReturningMethodInterface abstract method</li>
   </ol>
   <div class="self-name">aTypedefReturningMethodInterface</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TemplatedInterface</h5>
+    <h5>TemplatedInterface class</h5>
     <ol>
       <li class="section-title"><a href="ex/TemplatedInterface-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TemplatedInterface/TemplatedInterface.html">TemplatedInterface</a></li>
@@ -72,6 +72,8 @@ <h5>class TemplatedInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aTypedefReturningMethodInterface method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;List<span class="signature">&lt;String&gt;</span>&gt;</span></span>
       <span class="name ">aTypedefReturningMethodInterface</span>(<wbr>)
@@ -82,7 +84,6 @@ <h5>class TemplatedInterface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method aTypedefReturningMethodInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html
index 00e5049ed3..93875919b3 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">abstract class TypedFunctionsWithoutTypedefs</li>
+    <li class="self-crumb">TypedFunctionsWithoutTypedefs abstract class</li>
   </ol>
   <div class="self-name">TypedFunctionsWithoutTypedefs</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>TypedFunctionsWithoutTypedefs class</h1>
 
     <section class="desc markdown">
       <p>This class has a complicated type situation.</p>
@@ -222,7 +223,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class TypedFunctionsWithoutTypedefs</h5>
     <ol>
       <li class="section-title"><a href="ex/TypedFunctionsWithoutTypedefs-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TypedFunctionsWithoutTypedefs/TypedFunctionsWithoutTypedefs.html">TypedFunctionsWithoutTypedefs</a></li>
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/TypedFunctionsWithoutTypedefs.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/TypedFunctionsWithoutTypedefs.html
index 30a965c88a..54d74960af 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/TypedFunctionsWithoutTypedefs.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/TypedFunctionsWithoutTypedefs.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TypedFunctionsWithoutTypedefs-class.html">TypedFunctionsWithoutTypedefs</a></li>
-    <li class="self-crumb">constructor TypedFunctionsWithoutTypedefs</li>
+    <li class="self-crumb">TypedFunctionsWithoutTypedefs constructor</li>
   </ol>
   <div class="self-name">TypedFunctionsWithoutTypedefs</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TypedFunctionsWithoutTypedefs</h5>
+    <h5>TypedFunctionsWithoutTypedefs class</h5>
     <ol>
       <li class="section-title"><a href="ex/TypedFunctionsWithoutTypedefs-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TypedFunctionsWithoutTypedefs/TypedFunctionsWithoutTypedefs.html">TypedFunctionsWithoutTypedefs</a></li>
@@ -64,6 +64,8 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>TypedFunctionsWithoutTypedefs constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">TypedFunctionsWithoutTypedefs</span>(<wbr>)
@@ -75,7 +77,6 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor TypedFunctionsWithoutTypedefs</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAComplexTypedef.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAComplexTypedef.html
index 384e61adff..c4572a327b 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAComplexTypedef.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAComplexTypedef.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TypedFunctionsWithoutTypedefs-class.html">TypedFunctionsWithoutTypedefs</a></li>
-    <li class="self-crumb">abstract method getAComplexTypedef&lt;A4, A5, A6&gt;</li>
+    <li class="self-crumb">getAComplexTypedef&lt;A4, A5, A6&gt; abstract method</li>
   </ol>
   <div class="self-name">getAComplexTypedef</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TypedFunctionsWithoutTypedefs</h5>
+    <h5>TypedFunctionsWithoutTypedefs class</h5>
     <ol>
       <li class="section-title"><a href="ex/TypedFunctionsWithoutTypedefs-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TypedFunctionsWithoutTypedefs/TypedFunctionsWithoutTypedefs.html">TypedFunctionsWithoutTypedefs</a></li>
@@ -64,6 +64,8 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>getAComplexTypedef&lt;A4, A5, A6&gt; method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype"><a href="ex/aComplexTypedef.html">aComplexTypedef</a></span>
       <span class="name ">getAComplexTypedef</span>&lt;A4, A5, A6&gt;(<wbr>)
@@ -77,7 +79,6 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method getAComplexTypedef</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html
index 9481cec858..d34f1f2cc7 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TypedFunctionsWithoutTypedefs-class.html">TypedFunctionsWithoutTypedefs</a></li>
-    <li class="self-crumb">abstract method getAFunctionReturningBool&lt;T1, T2, T3&gt;</li>
+    <li class="self-crumb">getAFunctionReturningBool&lt;T1, T2, T3&gt; abstract method</li>
   </ol>
   <div class="self-name">getAFunctionReturningBool</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TypedFunctionsWithoutTypedefs</h5>
+    <h5>TypedFunctionsWithoutTypedefs class</h5>
     <ol>
       <li class="section-title"><a href="ex/TypedFunctionsWithoutTypedefs-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TypedFunctionsWithoutTypedefs/TypedFunctionsWithoutTypedefs.html">TypedFunctionsWithoutTypedefs</a></li>
@@ -64,6 +64,8 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>getAFunctionReturningBool&lt;T1, T2, T3&gt; method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Function<span class="signature">&lt;T4&gt;</span><span class="signature">(<span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">String</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T4</span></span>)</span></span>
       <span class="name ">getAFunctionReturningBool</span>&lt;T1, T2, T3&gt;(<wbr>)
@@ -78,7 +80,6 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method getAFunctionReturningBool</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html
index 245e39e26d..37169895c8 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TypedFunctionsWithoutTypedefs-class.html">TypedFunctionsWithoutTypedefs</a></li>
-    <li class="self-crumb">abstract method getAFunctionReturningVoid&lt;T1, T2&gt;</li>
+    <li class="self-crumb">getAFunctionReturningVoid&lt;T1, T2&gt; abstract method</li>
   </ol>
   <div class="self-name">getAFunctionReturningVoid</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TypedFunctionsWithoutTypedefs</h5>
+    <h5>TypedFunctionsWithoutTypedefs class</h5>
     <ol>
       <li class="section-title"><a href="ex/TypedFunctionsWithoutTypedefs-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TypedFunctionsWithoutTypedefs/TypedFunctionsWithoutTypedefs.html">TypedFunctionsWithoutTypedefs</a></li>
@@ -64,6 +64,8 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>getAFunctionReturningVoid&lt;T1, T2&gt; method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Function<span class="signature">(<span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T2</span></span>)</span></span>
       <span class="name ">getAFunctionReturningVoid</span>&lt;T1, T2&gt;(<wbr><span class="parameter" id="getAFunctionReturningVoid-param-callback"><span class="type-annotation">void</span> <span class="parameter-name">callback</span>(<span class="parameter" id="callback-param-argument1"><span class="type-annotation">T1</span> <span class="parameter-name">argument1</span>, </span> <span class="parameter" id="callback-param-argument2"><span class="type-annotation">T2</span> <span class="parameter-name">argument2</span></span>)</span>)
@@ -77,7 +79,6 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method getAFunctionReturningVoid</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/hashCode.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/hashCode.html
index 0c35ef08f7..6cdac90ced 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/hashCode.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TypedFunctionsWithoutTypedefs-class.html">TypedFunctionsWithoutTypedefs</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TypedFunctionsWithoutTypedefs</h5>
+    <h5>TypedFunctionsWithoutTypedefs class</h5>
     <ol>
       <li class="section-title"><a href="ex/TypedFunctionsWithoutTypedefs-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TypedFunctionsWithoutTypedefs/TypedFunctionsWithoutTypedefs.html">TypedFunctionsWithoutTypedefs</a></li>
@@ -64,6 +64,8 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -78,7 +80,6 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/noSuchMethod.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/noSuchMethod.html
index 6aa94640d0..38603c0db4 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/noSuchMethod.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TypedFunctionsWithoutTypedefs-class.html">TypedFunctionsWithoutTypedefs</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TypedFunctionsWithoutTypedefs</h5>
+    <h5>TypedFunctionsWithoutTypedefs class</h5>
     <ol>
       <li class="section-title"><a href="ex/TypedFunctionsWithoutTypedefs-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TypedFunctionsWithoutTypedefs/TypedFunctionsWithoutTypedefs.html">TypedFunctionsWithoutTypedefs</a></li>
@@ -64,6 +64,8 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -74,7 +76,6 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/operator_equals.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/operator_equals.html
index ee5dc5b580..568ebf89c4 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/operator_equals.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TypedFunctionsWithoutTypedefs-class.html">TypedFunctionsWithoutTypedefs</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TypedFunctionsWithoutTypedefs</h5>
+    <h5>TypedFunctionsWithoutTypedefs class</h5>
     <ol>
       <li class="section-title"><a href="ex/TypedFunctionsWithoutTypedefs-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TypedFunctionsWithoutTypedefs/TypedFunctionsWithoutTypedefs.html">TypedFunctionsWithoutTypedefs</a></li>
@@ -64,6 +64,8 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -74,7 +76,6 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/runtimeType.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/runtimeType.html
index e873b51f3b..8e64d66689 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/runtimeType.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TypedFunctionsWithoutTypedefs-class.html">TypedFunctionsWithoutTypedefs</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TypedFunctionsWithoutTypedefs</h5>
+    <h5>TypedFunctionsWithoutTypedefs class</h5>
     <ol>
       <li class="section-title"><a href="ex/TypedFunctionsWithoutTypedefs-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TypedFunctionsWithoutTypedefs/TypedFunctionsWithoutTypedefs.html">TypedFunctionsWithoutTypedefs</a></li>
@@ -64,6 +64,8 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -78,7 +80,6 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/toString.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/toString.html
index 9c944fdede..be160a3b79 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/toString.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TypedFunctionsWithoutTypedefs-class.html">TypedFunctionsWithoutTypedefs</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class TypedFunctionsWithoutTypedefs</h5>
+    <h5>TypedFunctionsWithoutTypedefs class</h5>
     <ol>
       <li class="section-title"><a href="ex/TypedFunctionsWithoutTypedefs-class.html#constructors">Constructors</a></li>
       <li><a href="ex/TypedFunctionsWithoutTypedefs/TypedFunctionsWithoutTypedefs.html">TypedFunctionsWithoutTypedefs</a></li>
@@ -64,6 +64,8 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -74,7 +76,6 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/WithGeneric-class.html b/testing/test_package_docs/ex/WithGeneric-class.html
index a832a10053..45967eaa63 100644
--- a/testing/test_package_docs/ex/WithGeneric-class.html
+++ b/testing/test_package_docs/ex/WithGeneric-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class WithGeneric<span class="signature">&lt;T&gt;</span></li>
+    <li class="self-crumb">WithGeneric<span class="signature">&lt;T&gt;</span> class</li>
   </ol>
   <div class="self-name">WithGeneric</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>WithGeneric&lt;T&gt; class</h1>
 
     
     <section>
@@ -211,7 +212,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class WithGeneric</h5>
     <ol>
       <li class="section-title"><a href="ex/WithGeneric-class.html#constructors">Constructors</a></li>
       <li><a href="ex/WithGeneric/WithGeneric.html">WithGeneric</a></li>
diff --git a/testing/test_package_docs/ex/WithGeneric/WithGeneric.html b/testing/test_package_docs/ex/WithGeneric/WithGeneric.html
index a3ad3fd4b9..e42c8322ac 100644
--- a/testing/test_package_docs/ex/WithGeneric/WithGeneric.html
+++ b/testing/test_package_docs/ex/WithGeneric/WithGeneric.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">constructor WithGeneric</li>
+    <li class="self-crumb">WithGeneric constructor</li>
   </ol>
   <div class="self-name">WithGeneric</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class WithGeneric</h5>
+    <h5>WithGeneric class</h5>
     <ol>
       <li class="section-title"><a href="ex/WithGeneric-class.html#constructors">Constructors</a></li>
       <li><a href="ex/WithGeneric/WithGeneric.html">WithGeneric</a></li>
@@ -62,6 +62,8 @@ <h5>class WithGeneric</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>WithGeneric&lt;T&gt; constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">WithGeneric&lt;T&gt;</span>(<wbr><span class="parameter" id="-param-prop"><span class="type-annotation">T</span> <span class="parameter-name">prop</span></span>)
@@ -73,7 +75,6 @@ <h5>class WithGeneric</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor WithGeneric</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/WithGeneric/hashCode.html b/testing/test_package_docs/ex/WithGeneric/hashCode.html
index 311154f642..02face6ecc 100644
--- a/testing/test_package_docs/ex/WithGeneric/hashCode.html
+++ b/testing/test_package_docs/ex/WithGeneric/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class WithGeneric</h5>
+    <h5>WithGeneric class</h5>
     <ol>
       <li class="section-title"><a href="ex/WithGeneric-class.html#constructors">Constructors</a></li>
       <li><a href="ex/WithGeneric/WithGeneric.html">WithGeneric</a></li>
@@ -62,6 +62,8 @@ <h5>class WithGeneric</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class WithGeneric</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/WithGeneric/noSuchMethod.html b/testing/test_package_docs/ex/WithGeneric/noSuchMethod.html
index 8abc9166ba..7937398b45 100644
--- a/testing/test_package_docs/ex/WithGeneric/noSuchMethod.html
+++ b/testing/test_package_docs/ex/WithGeneric/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class WithGeneric</h5>
+    <h5>WithGeneric class</h5>
     <ol>
       <li class="section-title"><a href="ex/WithGeneric-class.html#constructors">Constructors</a></li>
       <li><a href="ex/WithGeneric/WithGeneric.html">WithGeneric</a></li>
@@ -62,6 +62,8 @@ <h5>class WithGeneric</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -72,7 +74,6 @@ <h5>class WithGeneric</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/WithGeneric/operator_equals.html b/testing/test_package_docs/ex/WithGeneric/operator_equals.html
index 59a268ffa0..37a2ebd3c0 100644
--- a/testing/test_package_docs/ex/WithGeneric/operator_equals.html
+++ b/testing/test_package_docs/ex/WithGeneric/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class WithGeneric</h5>
+    <h5>WithGeneric class</h5>
     <ol>
       <li class="section-title"><a href="ex/WithGeneric-class.html#constructors">Constructors</a></li>
       <li><a href="ex/WithGeneric/WithGeneric.html">WithGeneric</a></li>
@@ -62,6 +62,8 @@ <h5>class WithGeneric</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -72,7 +74,6 @@ <h5>class WithGeneric</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/WithGeneric/prop.html b/testing/test_package_docs/ex/WithGeneric/prop.html
index 1ee4f047d3..59351de314 100644
--- a/testing/test_package_docs/ex/WithGeneric/prop.html
+++ b/testing/test_package_docs/ex/WithGeneric/prop.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">property prop</li>
+    <li class="self-crumb">prop property</li>
   </ol>
   <div class="self-name">prop</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class WithGeneric</h5>
+    <h5>WithGeneric class</h5>
     <ol>
       <li class="section-title"><a href="ex/WithGeneric-class.html#constructors">Constructors</a></li>
       <li><a href="ex/WithGeneric/WithGeneric.html">WithGeneric</a></li>
@@ -62,6 +62,8 @@ <h5>class WithGeneric</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>prop property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">T</span>
           <span class="name ">prop</span>          <div class="features">read / write</div>
@@ -71,7 +73,6 @@ <h5>class WithGeneric</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property prop</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/WithGeneric/runtimeType.html b/testing/test_package_docs/ex/WithGeneric/runtimeType.html
index 767bc5d238..19c7cb01eb 100644
--- a/testing/test_package_docs/ex/WithGeneric/runtimeType.html
+++ b/testing/test_package_docs/ex/WithGeneric/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class WithGeneric</h5>
+    <h5>WithGeneric class</h5>
     <ol>
       <li class="section-title"><a href="ex/WithGeneric-class.html#constructors">Constructors</a></li>
       <li><a href="ex/WithGeneric/WithGeneric.html">WithGeneric</a></li>
@@ -62,6 +62,8 @@ <h5>class WithGeneric</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class WithGeneric</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/WithGeneric/toString.html b/testing/test_package_docs/ex/WithGeneric/toString.html
index 4ced662115..418f236b2a 100644
--- a/testing/test_package_docs/ex/WithGeneric/toString.html
+++ b/testing/test_package_docs/ex/WithGeneric/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class WithGeneric</h5>
+    <h5>WithGeneric class</h5>
     <ol>
       <li class="section-title"><a href="ex/WithGeneric-class.html#constructors">Constructors</a></li>
       <li><a href="ex/WithGeneric/WithGeneric.html">WithGeneric</a></li>
@@ -62,6 +62,8 @@ <h5>class WithGeneric</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class WithGeneric</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/WithGenericSub-class.html b/testing/test_package_docs/ex/WithGenericSub-class.html
index 434f04ab2c..6ec524db3f 100644
--- a/testing/test_package_docs/ex/WithGenericSub-class.html
+++ b/testing/test_package_docs/ex/WithGenericSub-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class WithGenericSub</li>
+    <li class="self-crumb">WithGenericSub class</li>
   </ol>
   <div class="self-name">WithGenericSub</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>WithGenericSub class</h1>
 
     
     <section>
@@ -213,7 +214,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class WithGenericSub</h5>
     <ol>
       <li class="section-title"><a href="ex/WithGenericSub-class.html#constructors">Constructors</a></li>
       <li><a href="ex/WithGenericSub/WithGenericSub.html">WithGenericSub</a></li>
diff --git a/testing/test_package_docs/ex/WithGenericSub/WithGenericSub.html b/testing/test_package_docs/ex/WithGenericSub/WithGenericSub.html
index e56d991065..4a9c29d611 100644
--- a/testing/test_package_docs/ex/WithGenericSub/WithGenericSub.html
+++ b/testing/test_package_docs/ex/WithGenericSub/WithGenericSub.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
-    <li class="self-crumb">constructor WithGenericSub</li>
+    <li class="self-crumb">WithGenericSub constructor</li>
   </ol>
   <div class="self-name">WithGenericSub</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class WithGenericSub</h5>
+    <h5>WithGenericSub class</h5>
     <ol>
       <li class="section-title"><a href="ex/WithGenericSub-class.html#constructors">Constructors</a></li>
       <li><a href="ex/WithGenericSub/WithGenericSub.html">WithGenericSub</a></li>
@@ -62,6 +62,8 @@ <h5>class WithGenericSub</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>WithGenericSub constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">WithGenericSub</span>(<wbr><span class="parameter" id="-param-prop"><span class="type-annotation"><a href="ex/Apple-class.html">Apple</a></span> <span class="parameter-name">prop</span></span>)
@@ -73,7 +75,6 @@ <h5>class WithGenericSub</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor WithGenericSub</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/aComplexTypedef.html b/testing/test_package_docs/ex/aComplexTypedef.html
index aa76d50fa6..59aee60532 100644
--- a/testing/test_package_docs/ex/aComplexTypedef.html
+++ b/testing/test_package_docs/ex/aComplexTypedef.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">typedef aComplexTypedef&lt;A1, A2, A3&gt;</li>
+    <li class="self-crumb">aComplexTypedef&lt;A1, A2, A3&gt; typedef</li>
   </ol>
   <div class="self-name">aComplexTypedef</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aComplexTypedef&lt;A1, A2, A3&gt; typedef</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">Function<span class="signature">(<span class="parameter" id="-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="-param-"><span class="type-annotation">A3</span></span>)</span></span>
@@ -121,7 +122,6 @@ <h5>library ex</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>typedef aComplexTypedef</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/aThingToDo-class.html b/testing/test_package_docs/ex/aThingToDo-class.html
index a2cd9a0ba8..bd2237e3d8 100644
--- a/testing/test_package_docs/ex/aThingToDo-class.html
+++ b/testing/test_package_docs/ex/aThingToDo-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">class aThingToDo</li>
+    <li class="self-crumb">aThingToDo class</li>
   </ol>
   <div class="self-name">aThingToDo</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aThingToDo class</h1>
 
     <section class="desc markdown">
       <p>A custom annotation.</p>
@@ -211,7 +212,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class aThingToDo</h5>
     <ol>
       <li class="section-title"><a href="ex/aThingToDo-class.html#constructors">Constructors</a></li>
       <li><a href="ex/aThingToDo/aThingToDo.html">aThingToDo</a></li>
diff --git a/testing/test_package_docs/ex/aThingToDo/aThingToDo.html b/testing/test_package_docs/ex/aThingToDo/aThingToDo.html
index cb3e8939fb..bf31a70509 100644
--- a/testing/test_package_docs/ex/aThingToDo/aThingToDo.html
+++ b/testing/test_package_docs/ex/aThingToDo/aThingToDo.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/aThingToDo-class.html">aThingToDo</a></li>
-    <li class="self-crumb">const constructor aThingToDo</li>
+    <li class="self-crumb">aThingToDo const constructor</li>
   </ol>
   <div class="self-name">aThingToDo</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class aThingToDo</h5>
+    <h5>aThingToDo class</h5>
     <ol>
       <li class="section-title"><a href="ex/aThingToDo-class.html#constructors">Constructors</a></li>
       <li><a href="ex/aThingToDo/aThingToDo.html">aThingToDo</a></li>
@@ -63,6 +63,8 @@ <h5>class aThingToDo</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aThingToDo constructor</h1>
+
     <section class="multi-line-signature">
       const
       <span class="name ">aThingToDo</span>(<wbr><span class="parameter" id="-param-who"><span class="type-annotation">String</span> <span class="parameter-name">who</span>, </span> <span class="parameter" id="-param-what"><span class="type-annotation">String</span> <span class="parameter-name">what</span></span>)
@@ -74,7 +76,6 @@ <h5>class aThingToDo</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor aThingToDo</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/aThingToDo/hashCode.html b/testing/test_package_docs/ex/aThingToDo/hashCode.html
index 21dc2f8caf..10a4c75b68 100644
--- a/testing/test_package_docs/ex/aThingToDo/hashCode.html
+++ b/testing/test_package_docs/ex/aThingToDo/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/aThingToDo-class.html">aThingToDo</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class aThingToDo</h5>
+    <h5>aThingToDo class</h5>
     <ol>
       <li class="section-title"><a href="ex/aThingToDo-class.html#constructors">Constructors</a></li>
       <li><a href="ex/aThingToDo/aThingToDo.html">aThingToDo</a></li>
@@ -63,6 +63,8 @@ <h5>class aThingToDo</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -77,7 +79,6 @@ <h5>class aThingToDo</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/aThingToDo/noSuchMethod.html b/testing/test_package_docs/ex/aThingToDo/noSuchMethod.html
index 75c174fe1f..8b2352b942 100644
--- a/testing/test_package_docs/ex/aThingToDo/noSuchMethod.html
+++ b/testing/test_package_docs/ex/aThingToDo/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/aThingToDo-class.html">aThingToDo</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class aThingToDo</h5>
+    <h5>aThingToDo class</h5>
     <ol>
       <li class="section-title"><a href="ex/aThingToDo-class.html#constructors">Constructors</a></li>
       <li><a href="ex/aThingToDo/aThingToDo.html">aThingToDo</a></li>
@@ -63,6 +63,8 @@ <h5>class aThingToDo</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -73,7 +75,6 @@ <h5>class aThingToDo</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/aThingToDo/operator_equals.html b/testing/test_package_docs/ex/aThingToDo/operator_equals.html
index deb8a6aac9..d23771a7f3 100644
--- a/testing/test_package_docs/ex/aThingToDo/operator_equals.html
+++ b/testing/test_package_docs/ex/aThingToDo/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/aThingToDo-class.html">aThingToDo</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class aThingToDo</h5>
+    <h5>aThingToDo class</h5>
     <ol>
       <li class="section-title"><a href="ex/aThingToDo-class.html#constructors">Constructors</a></li>
       <li><a href="ex/aThingToDo/aThingToDo.html">aThingToDo</a></li>
@@ -63,6 +63,8 @@ <h5>class aThingToDo</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -73,7 +75,6 @@ <h5>class aThingToDo</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/aThingToDo/runtimeType.html b/testing/test_package_docs/ex/aThingToDo/runtimeType.html
index c7e5f58239..ba8f5abfc5 100644
--- a/testing/test_package_docs/ex/aThingToDo/runtimeType.html
+++ b/testing/test_package_docs/ex/aThingToDo/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/aThingToDo-class.html">aThingToDo</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class aThingToDo</h5>
+    <h5>aThingToDo class</h5>
     <ol>
       <li class="section-title"><a href="ex/aThingToDo-class.html#constructors">Constructors</a></li>
       <li><a href="ex/aThingToDo/aThingToDo.html">aThingToDo</a></li>
@@ -63,6 +63,8 @@ <h5>class aThingToDo</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -77,7 +79,6 @@ <h5>class aThingToDo</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/aThingToDo/toString.html b/testing/test_package_docs/ex/aThingToDo/toString.html
index dd8f49c3f1..37587ecddf 100644
--- a/testing/test_package_docs/ex/aThingToDo/toString.html
+++ b/testing/test_package_docs/ex/aThingToDo/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/aThingToDo-class.html">aThingToDo</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class aThingToDo</h5>
+    <h5>aThingToDo class</h5>
     <ol>
       <li class="section-title"><a href="ex/aThingToDo-class.html#constructors">Constructors</a></li>
       <li><a href="ex/aThingToDo/aThingToDo.html">aThingToDo</a></li>
@@ -63,6 +63,8 @@ <h5>class aThingToDo</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -73,7 +75,6 @@ <h5>class aThingToDo</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/aThingToDo/what.html b/testing/test_package_docs/ex/aThingToDo/what.html
index 9fa7b4684e..ca02f54bed 100644
--- a/testing/test_package_docs/ex/aThingToDo/what.html
+++ b/testing/test_package_docs/ex/aThingToDo/what.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/aThingToDo-class.html">aThingToDo</a></li>
-    <li class="self-crumb">property what</li>
+    <li class="self-crumb">what property</li>
   </ol>
   <div class="self-name">what</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class aThingToDo</h5>
+    <h5>aThingToDo class</h5>
     <ol>
       <li class="section-title"><a href="ex/aThingToDo-class.html#constructors">Constructors</a></li>
       <li><a href="ex/aThingToDo/aThingToDo.html">aThingToDo</a></li>
@@ -63,6 +63,8 @@ <h5>class aThingToDo</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>what property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">String</span>
           <span class="name ">what</span>          <div class="features">final</div>
@@ -72,7 +74,6 @@ <h5>class aThingToDo</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property what</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/aThingToDo/who.html b/testing/test_package_docs/ex/aThingToDo/who.html
index bbeff4cafa..e23910a64a 100644
--- a/testing/test_package_docs/ex/aThingToDo/who.html
+++ b/testing/test_package_docs/ex/aThingToDo/who.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/aThingToDo-class.html">aThingToDo</a></li>
-    <li class="self-crumb">property who</li>
+    <li class="self-crumb">who property</li>
   </ol>
   <div class="self-name">who</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class aThingToDo</h5>
+    <h5>aThingToDo class</h5>
     <ol>
       <li class="section-title"><a href="ex/aThingToDo-class.html#constructors">Constructors</a></li>
       <li><a href="ex/aThingToDo/aThingToDo.html">aThingToDo</a></li>
@@ -63,6 +63,8 @@ <h5>class aThingToDo</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>who property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">String</span>
           <span class="name ">who</span>          <div class="features">final</div>
@@ -72,7 +74,6 @@ <h5>class aThingToDo</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property who</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/deprecated-constant.html b/testing/test_package_docs/ex/deprecated-constant.html
index fd64694e09..d4b8921417 100644
--- a/testing/test_package_docs/ex/deprecated-constant.html
+++ b/testing/test_package_docs/ex/deprecated-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">constant deprecated</li>
+    <li class="self-crumb">deprecated constant</li>
   </ol>
   <div class="self-name">deprecated</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>deprecated top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name ">deprecated</span>      =
@@ -119,7 +120,6 @@ <h5>library ex</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property deprecated</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/deprecatedField.html b/testing/test_package_docs/ex/deprecatedField.html
index 9f79e90218..5e88f9c703 100644
--- a/testing/test_package_docs/ex/deprecatedField.html
+++ b/testing/test_package_docs/ex/deprecatedField.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">property <span class="deprecated">deprecatedField</span></li>
+    <li class="self-crumb"><span class="deprecated">deprecatedField</span> property</li>
   </ol>
   <div class="self-name">deprecatedField</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,8 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>deprecatedField top-level property</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">int</span>
       <span class="name deprecated">deprecatedField</span>      <div class="features">read / write</div>
@@ -117,7 +119,6 @@ <h5>library ex</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property deprecatedField</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/deprecatedGetter.html b/testing/test_package_docs/ex/deprecatedGetter.html
index 80348665ea..62e9118276 100644
--- a/testing/test_package_docs/ex/deprecatedGetter.html
+++ b/testing/test_package_docs/ex/deprecatedGetter.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">property <span class="deprecated">deprecatedGetter</span></li>
+    <li class="self-crumb"><span class="deprecated">deprecatedGetter</span> property</li>
   </ol>
   <div class="self-name">deprecatedGetter</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,8 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>deprecatedGetter top-level property</h1>
+
 
     <section id="getter">
     
@@ -121,7 +123,6 @@ <h5>library ex</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property deprecatedGetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/deprecatedSetter.html b/testing/test_package_docs/ex/deprecatedSetter.html
index c0cfc4a535..b6f3fd77ef 100644
--- a/testing/test_package_docs/ex/deprecatedSetter.html
+++ b/testing/test_package_docs/ex/deprecatedSetter.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">property <span class="deprecated">deprecatedSetter</span></li>
+    <li class="self-crumb"><span class="deprecated">deprecatedSetter</span> property</li>
   </ol>
   <div class="self-name">deprecatedSetter</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,8 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>deprecatedSetter top-level property</h1>
+
 
 
     <section id="setter">
@@ -122,7 +124,6 @@ <h5>library ex</h5>
       </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property deprecatedSetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/ex-library.html b/testing/test_package_docs/ex/ex-library.html
index 1eb0c5875f..93dd490c76 100644
--- a/testing/test_package_docs/ex/ex-library.html
+++ b/testing/test_package_docs/ex/ex-library.html
@@ -24,7 +24,7 @@
   <button id="sidenav-left-toggle" type="button">&nbsp;</button>
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
-    <li class="self-crumb">library ex</li>
+    <li class="self-crumb">ex library</li>
   </ol>
   <div class="self-name">ex</div>
   <form class="search navbar-right" role="search">
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>package test_package</h5>
+    <h5>test_package package</h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
@@ -54,6 +54,7 @@ <h5>package test_package</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ex library</h1>
 
     <section class="desc markdown">
       <p>a library. testing string escaping: <code>var s = 'a string'</code> <cool></cool></p>
@@ -497,7 +498,7 @@ <h2>Exceptions / Errors</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
diff --git a/testing/test_package_docs/ex/function1.html b/testing/test_package_docs/ex/function1.html
index 7e67cd7c7c..ca2e36d3f2 100644
--- a/testing/test_package_docs/ex/function1.html
+++ b/testing/test_package_docs/ex/function1.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">function function1</li>
+    <li class="self-crumb">function1 function</li>
   </ol>
   <div class="self-name">function1</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>function1 function</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">int</span>
@@ -118,7 +119,6 @@ <h5>library ex</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>function function1</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/genericFunction.html b/testing/test_package_docs/ex/genericFunction.html
index 4df509a697..857b40bb70 100644
--- a/testing/test_package_docs/ex/genericFunction.html
+++ b/testing/test_package_docs/ex/genericFunction.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">function genericFunction&lt;T&gt;</li>
+    <li class="self-crumb">genericFunction&lt;T&gt; function</li>
   </ol>
   <div class="self-name">genericFunction</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>genericFunction&lt;T&gt; function</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">T</span>
@@ -118,7 +119,6 @@ <h5>library ex</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>function genericFunction</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/incorrectDocReference-constant.html b/testing/test_package_docs/ex/incorrectDocReference-constant.html
index 162188e884..926f9f6523 100644
--- a/testing/test_package_docs/ex/incorrectDocReference-constant.html
+++ b/testing/test_package_docs/ex/incorrectDocReference-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">constant incorrectDocReference</li>
+    <li class="self-crumb">incorrectDocReference constant</li>
   </ol>
   <div class="self-name">incorrectDocReference</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>incorrectDocReference top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name ">incorrectDocReference</span>      =
@@ -122,7 +123,6 @@ <h5>library ex</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property incorrectDocReference</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html b/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html
index ee6d269a8b..4862d1efc3 100644
--- a/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html
+++ b/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">constant incorrectDocReferenceFromEx</li>
+    <li class="self-crumb">incorrectDocReferenceFromEx constant</li>
   </ol>
   <div class="self-name">incorrectDocReferenceFromEx</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>incorrectDocReferenceFromEx top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name ">incorrectDocReferenceFromEx</span>      =
@@ -122,7 +123,6 @@ <h5>library ex</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property incorrectDocReferenceFromEx</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/number.html b/testing/test_package_docs/ex/number.html
index f96fea682f..d1a054576f 100644
--- a/testing/test_package_docs/ex/number.html
+++ b/testing/test_package_docs/ex/number.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">property number</li>
+    <li class="self-crumb">number property</li>
   </ol>
   <div class="self-name">number</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,8 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>number top-level property</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">double</span>
       <span class="name ">number</span>      <div class="features">read / write</div>
@@ -117,7 +119,6 @@ <h5>library ex</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property number</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/processMessage.html b/testing/test_package_docs/ex/processMessage.html
index a72d3b472f..7e2426c7e3 100644
--- a/testing/test_package_docs/ex/processMessage.html
+++ b/testing/test_package_docs/ex/processMessage.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">typedef processMessage&lt;T&gt;</li>
+    <li class="self-crumb">processMessage&lt;T&gt; typedef</li>
   </ol>
   <div class="self-name">processMessage</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,7 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>processMessage&lt;T&gt; typedef</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">String</span>
@@ -118,7 +119,6 @@ <h5>library ex</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>typedef processMessage</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/ex/y.html b/testing/test_package_docs/ex/y.html
index daadae0511..d1df70c448 100644
--- a/testing/test_package_docs/ex/y.html
+++ b/testing/test_package_docs/ex/y.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">property y</li>
+    <li class="self-crumb">y property</li>
   </ol>
   <div class="self-name">y</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library ex</h5>
+    <h5>ex library</h5>
     <ol>
       <li class="section-title"><a href="ex/ex-library.html#classes">Classes</a></li>
       <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
@@ -107,6 +107,8 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>y top-level property</h1>
+
 
     <section id="getter">
     
@@ -121,7 +123,6 @@ <h5>library ex</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property y</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/AClassUsingASuperMixin-class.html b/testing/test_package_docs/fake/AClassUsingASuperMixin-class.html
index 1c21adaaea..1ae2f5826e 100644
--- a/testing/test_package_docs/fake/AClassUsingASuperMixin-class.html
+++ b/testing/test_package_docs/fake/AClassUsingASuperMixin-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class AClassUsingASuperMixin</li>
+    <li class="self-crumb">AClassUsingASuperMixin class</li>
   </ol>
   <div class="self-name">AClassUsingASuperMixin</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>AClassUsingASuperMixin class</h1>
 
     <section class="desc markdown">
       <p>Verify super-mixins don't break Dartdoc.</p>
@@ -241,7 +242,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class AClassUsingASuperMixin</h5>
     <ol>
       <li class="section-title"><a href="fake/AClassUsingASuperMixin-class.html#constructors">Constructors</a></li>
       <li><a href="fake/AClassUsingASuperMixin/AClassUsingASuperMixin.html">AClassUsingASuperMixin</a></li>
diff --git a/testing/test_package_docs/fake/AClassUsingASuperMixin/AClassUsingASuperMixin.html b/testing/test_package_docs/fake/AClassUsingASuperMixin/AClassUsingASuperMixin.html
index 9369f6521f..0077e77d5d 100644
--- a/testing/test_package_docs/fake/AClassUsingASuperMixin/AClassUsingASuperMixin.html
+++ b/testing/test_package_docs/fake/AClassUsingASuperMixin/AClassUsingASuperMixin.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
-    <li class="self-crumb">constructor AClassUsingASuperMixin</li>
+    <li class="self-crumb">AClassUsingASuperMixin constructor</li>
   </ol>
   <div class="self-name">AClassUsingASuperMixin</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AClassUsingASuperMixin</h5>
+    <h5>AClassUsingASuperMixin class</h5>
     <ol>
       <li class="section-title"><a href="fake/AClassUsingASuperMixin-class.html#constructors">Constructors</a></li>
       <li><a href="fake/AClassUsingASuperMixin/AClassUsingASuperMixin.html">AClassUsingASuperMixin</a></li>
@@ -62,6 +62,8 @@ <h5>class AClassUsingASuperMixin</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>AClassUsingASuperMixin constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">AClassUsingASuperMixin</span>(<wbr>)
@@ -73,7 +75,6 @@ <h5>class AClassUsingASuperMixin</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor AClassUsingASuperMixin</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/AMixinCallingSuper-class.html b/testing/test_package_docs/fake/AMixinCallingSuper-class.html
index c8f3607889..ee85ecf0f6 100644
--- a/testing/test_package_docs/fake/AMixinCallingSuper-class.html
+++ b/testing/test_package_docs/fake/AMixinCallingSuper-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class AMixinCallingSuper</li>
+    <li class="self-crumb">AMixinCallingSuper class</li>
   </ol>
   <div class="self-name">AMixinCallingSuper</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>AMixinCallingSuper class</h1>
 
     
     <section>
@@ -238,7 +239,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class AMixinCallingSuper</h5>
     <ol>
       <li class="section-title"><a href="fake/AMixinCallingSuper-class.html#constructors">Constructors</a></li>
       <li><a href="fake/AMixinCallingSuper/AMixinCallingSuper.html">AMixinCallingSuper</a></li>
diff --git a/testing/test_package_docs/fake/AMixinCallingSuper/AMixinCallingSuper.html b/testing/test_package_docs/fake/AMixinCallingSuper/AMixinCallingSuper.html
index 63d5c69938..9b6f1e23fd 100644
--- a/testing/test_package_docs/fake/AMixinCallingSuper/AMixinCallingSuper.html
+++ b/testing/test_package_docs/fake/AMixinCallingSuper/AMixinCallingSuper.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
-    <li class="self-crumb">constructor AMixinCallingSuper</li>
+    <li class="self-crumb">AMixinCallingSuper constructor</li>
   </ol>
   <div class="self-name">AMixinCallingSuper</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AMixinCallingSuper</h5>
+    <h5>AMixinCallingSuper class</h5>
     <ol>
       <li class="section-title"><a href="fake/AMixinCallingSuper-class.html#constructors">Constructors</a></li>
       <li><a href="fake/AMixinCallingSuper/AMixinCallingSuper.html">AMixinCallingSuper</a></li>
@@ -62,6 +62,8 @@ <h5>class AMixinCallingSuper</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>AMixinCallingSuper constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">AMixinCallingSuper</span>(<wbr>)
@@ -73,7 +75,6 @@ <h5>class AMixinCallingSuper</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor AMixinCallingSuper</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/AMixinCallingSuper/superString.html b/testing/test_package_docs/fake/AMixinCallingSuper/superString.html
index 4e8dec28f5..f26116e4f1 100644
--- a/testing/test_package_docs/fake/AMixinCallingSuper/superString.html
+++ b/testing/test_package_docs/fake/AMixinCallingSuper/superString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
-    <li class="self-crumb">property superString</li>
+    <li class="self-crumb">superString property</li>
   </ol>
   <div class="self-name">superString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AMixinCallingSuper</h5>
+    <h5>AMixinCallingSuper class</h5>
     <ol>
       <li class="section-title"><a href="fake/AMixinCallingSuper-class.html#constructors">Constructors</a></li>
       <li><a href="fake/AMixinCallingSuper/AMixinCallingSuper.html">AMixinCallingSuper</a></li>
@@ -62,6 +62,8 @@ <h5>class AMixinCallingSuper</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>superString property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class AMixinCallingSuper</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property superString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Annotation-class.html b/testing/test_package_docs/fake/Annotation-class.html
index bb98a76dbf..bb3827e648 100644
--- a/testing/test_package_docs/fake/Annotation-class.html
+++ b/testing/test_package_docs/fake/Annotation-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class Annotation</li>
+    <li class="self-crumb">Annotation class</li>
   </ol>
   <div class="self-name">Annotation</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Annotation class</h1>
 
     <section class="desc markdown">
       <p>Useful for annotations.</p>
@@ -224,7 +225,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class Annotation</h5>
     <ol>
       <li class="section-title"><a href="fake/Annotation-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Annotation/Annotation.html">Annotation</a></li>
diff --git a/testing/test_package_docs/fake/Annotation/Annotation.html b/testing/test_package_docs/fake/Annotation/Annotation.html
index 5e12aa8f65..d3feb31bd4 100644
--- a/testing/test_package_docs/fake/Annotation/Annotation.html
+++ b/testing/test_package_docs/fake/Annotation/Annotation.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Annotation-class.html">Annotation</a></li>
-    <li class="self-crumb">const constructor Annotation</li>
+    <li class="self-crumb">Annotation const constructor</li>
   </ol>
   <div class="self-name">Annotation</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Annotation</h5>
+    <h5>Annotation class</h5>
     <ol>
       <li class="section-title"><a href="fake/Annotation-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Annotation/Annotation.html">Annotation</a></li>
@@ -62,6 +62,8 @@ <h5>class Annotation</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Annotation constructor</h1>
+
     <section class="multi-line-signature">
       const
       <span class="name ">Annotation</span>(<wbr><span class="parameter" id="-param-value"><span class="type-annotation">String</span> <span class="parameter-name">value</span></span>)
@@ -73,7 +75,6 @@ <h5>class Annotation</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor Annotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Annotation/hashCode.html b/testing/test_package_docs/fake/Annotation/hashCode.html
index 3dd26966cc..70dbaf6dfd 100644
--- a/testing/test_package_docs/fake/Annotation/hashCode.html
+++ b/testing/test_package_docs/fake/Annotation/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Annotation-class.html">Annotation</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Annotation</h5>
+    <h5>Annotation class</h5>
     <ol>
       <li class="section-title"><a href="fake/Annotation-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Annotation/Annotation.html">Annotation</a></li>
@@ -62,6 +62,8 @@ <h5>class Annotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class Annotation</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Annotation/noSuchMethod.html b/testing/test_package_docs/fake/Annotation/noSuchMethod.html
index f68176ee3b..4fbcb16999 100644
--- a/testing/test_package_docs/fake/Annotation/noSuchMethod.html
+++ b/testing/test_package_docs/fake/Annotation/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Annotation-class.html">Annotation</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Annotation</h5>
+    <h5>Annotation class</h5>
     <ol>
       <li class="section-title"><a href="fake/Annotation-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Annotation/Annotation.html">Annotation</a></li>
@@ -62,6 +62,8 @@ <h5>class Annotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -72,7 +74,6 @@ <h5>class Annotation</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Annotation/operator_equals.html b/testing/test_package_docs/fake/Annotation/operator_equals.html
index 8f36edb19d..12fad2a069 100644
--- a/testing/test_package_docs/fake/Annotation/operator_equals.html
+++ b/testing/test_package_docs/fake/Annotation/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Annotation-class.html">Annotation</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Annotation</h5>
+    <h5>Annotation class</h5>
     <ol>
       <li class="section-title"><a href="fake/Annotation-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Annotation/Annotation.html">Annotation</a></li>
@@ -62,6 +62,8 @@ <h5>class Annotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -72,7 +74,6 @@ <h5>class Annotation</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Annotation/runtimeType.html b/testing/test_package_docs/fake/Annotation/runtimeType.html
index e540e110a2..4319e149be 100644
--- a/testing/test_package_docs/fake/Annotation/runtimeType.html
+++ b/testing/test_package_docs/fake/Annotation/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Annotation-class.html">Annotation</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Annotation</h5>
+    <h5>Annotation class</h5>
     <ol>
       <li class="section-title"><a href="fake/Annotation-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Annotation/Annotation.html">Annotation</a></li>
@@ -62,6 +62,8 @@ <h5>class Annotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class Annotation</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Annotation/toString.html b/testing/test_package_docs/fake/Annotation/toString.html
index fa1f93991e..9ed1d6be5f 100644
--- a/testing/test_package_docs/fake/Annotation/toString.html
+++ b/testing/test_package_docs/fake/Annotation/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Annotation-class.html">Annotation</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Annotation</h5>
+    <h5>Annotation class</h5>
     <ol>
       <li class="section-title"><a href="fake/Annotation-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Annotation/Annotation.html">Annotation</a></li>
@@ -62,6 +62,8 @@ <h5>class Annotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class Annotation</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Annotation/value.html b/testing/test_package_docs/fake/Annotation/value.html
index e294a07924..5bf5debcd0 100644
--- a/testing/test_package_docs/fake/Annotation/value.html
+++ b/testing/test_package_docs/fake/Annotation/value.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Annotation-class.html">Annotation</a></li>
-    <li class="self-crumb">property value</li>
+    <li class="self-crumb">value property</li>
   </ol>
   <div class="self-name">value</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Annotation</h5>
+    <h5>Annotation class</h5>
     <ol>
       <li class="section-title"><a href="fake/Annotation-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Annotation/Annotation.html">Annotation</a></li>
@@ -62,6 +62,8 @@ <h5>class Annotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>value property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">String</span>
           <span class="name ">value</span>          <div class="features">final</div>
@@ -71,7 +73,6 @@ <h5>class Annotation</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property value</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/AnotherInterface-class.html b/testing/test_package_docs/fake/AnotherInterface-class.html
index d4a45d12d7..0c8742464e 100644
--- a/testing/test_package_docs/fake/AnotherInterface-class.html
+++ b/testing/test_package_docs/fake/AnotherInterface-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">abstract class AnotherInterface</li>
+    <li class="self-crumb">AnotherInterface abstract class</li>
   </ol>
   <div class="self-name">AnotherInterface</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>AnotherInterface class</h1>
 
     <section class="desc markdown">
       <p>Yet another interface that can be implemented.</p>
@@ -228,7 +229,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class AnotherInterface</h5>
     <ol>
       <li class="section-title"><a href="fake/AnotherInterface-class.html#constructors">Constructors</a></li>
       <li><a href="fake/AnotherInterface/AnotherInterface.html">AnotherInterface</a></li>
diff --git a/testing/test_package_docs/fake/AnotherInterface/AnotherInterface.html b/testing/test_package_docs/fake/AnotherInterface/AnotherInterface.html
index ce998f08a6..f2524a4859 100644
--- a/testing/test_package_docs/fake/AnotherInterface/AnotherInterface.html
+++ b/testing/test_package_docs/fake/AnotherInterface/AnotherInterface.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
-    <li class="self-crumb">constructor AnotherInterface</li>
+    <li class="self-crumb">AnotherInterface constructor</li>
   </ol>
   <div class="self-name">AnotherInterface</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AnotherInterface</h5>
+    <h5>AnotherInterface class</h5>
     <ol>
       <li class="section-title"><a href="fake/AnotherInterface-class.html#constructors">Constructors</a></li>
       <li><a href="fake/AnotherInterface/AnotherInterface.html">AnotherInterface</a></li>
@@ -61,6 +61,8 @@ <h5>class AnotherInterface</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>AnotherInterface constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">AnotherInterface</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class AnotherInterface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor AnotherInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/AnotherInterface/hashCode.html b/testing/test_package_docs/fake/AnotherInterface/hashCode.html
index 1748378028..950580e163 100644
--- a/testing/test_package_docs/fake/AnotherInterface/hashCode.html
+++ b/testing/test_package_docs/fake/AnotherInterface/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AnotherInterface</h5>
+    <h5>AnotherInterface class</h5>
     <ol>
       <li class="section-title"><a href="fake/AnotherInterface-class.html#constructors">Constructors</a></li>
       <li><a href="fake/AnotherInterface/AnotherInterface.html">AnotherInterface</a></li>
@@ -61,6 +61,8 @@ <h5>class AnotherInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class AnotherInterface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/AnotherInterface/noSuchMethod.html b/testing/test_package_docs/fake/AnotherInterface/noSuchMethod.html
index f4b56ec86d..2d7bc334cf 100644
--- a/testing/test_package_docs/fake/AnotherInterface/noSuchMethod.html
+++ b/testing/test_package_docs/fake/AnotherInterface/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AnotherInterface</h5>
+    <h5>AnotherInterface class</h5>
     <ol>
       <li class="section-title"><a href="fake/AnotherInterface-class.html#constructors">Constructors</a></li>
       <li><a href="fake/AnotherInterface/AnotherInterface.html">AnotherInterface</a></li>
@@ -61,6 +61,8 @@ <h5>class AnotherInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -71,7 +73,6 @@ <h5>class AnotherInterface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/AnotherInterface/operator_equals.html b/testing/test_package_docs/fake/AnotherInterface/operator_equals.html
index 7121a5342a..98ba16224e 100644
--- a/testing/test_package_docs/fake/AnotherInterface/operator_equals.html
+++ b/testing/test_package_docs/fake/AnotherInterface/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AnotherInterface</h5>
+    <h5>AnotherInterface class</h5>
     <ol>
       <li class="section-title"><a href="fake/AnotherInterface-class.html#constructors">Constructors</a></li>
       <li><a href="fake/AnotherInterface/AnotherInterface.html">AnotherInterface</a></li>
@@ -61,6 +61,8 @@ <h5>class AnotherInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -71,7 +73,6 @@ <h5>class AnotherInterface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/AnotherInterface/runtimeType.html b/testing/test_package_docs/fake/AnotherInterface/runtimeType.html
index 128de8a2ff..ec851d0a40 100644
--- a/testing/test_package_docs/fake/AnotherInterface/runtimeType.html
+++ b/testing/test_package_docs/fake/AnotherInterface/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AnotherInterface</h5>
+    <h5>AnotherInterface class</h5>
     <ol>
       <li class="section-title"><a href="fake/AnotherInterface-class.html#constructors">Constructors</a></li>
       <li><a href="fake/AnotherInterface/AnotherInterface.html">AnotherInterface</a></li>
@@ -61,6 +61,8 @@ <h5>class AnotherInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class AnotherInterface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/AnotherInterface/toString.html b/testing/test_package_docs/fake/AnotherInterface/toString.html
index f68d9682e3..73fe3f1b57 100644
--- a/testing/test_package_docs/fake/AnotherInterface/toString.html
+++ b/testing/test_package_docs/fake/AnotherInterface/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AnotherInterface</h5>
+    <h5>AnotherInterface class</h5>
     <ol>
       <li class="section-title"><a href="fake/AnotherInterface-class.html#constructors">Constructors</a></li>
       <li><a href="fake/AnotherInterface/AnotherInterface.html">AnotherInterface</a></li>
@@ -61,6 +61,8 @@ <h5>class AnotherInterface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -71,7 +73,6 @@ <h5>class AnotherInterface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/BaseForDocComments-class.html b/testing/test_package_docs/fake/BaseForDocComments-class.html
index 9e87065a58..8bb3222025 100644
--- a/testing/test_package_docs/fake/BaseForDocComments-class.html
+++ b/testing/test_package_docs/fake/BaseForDocComments-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class BaseForDocComments</li>
+    <li class="self-crumb">BaseForDocComments class</li>
   </ol>
   <div class="self-name">BaseForDocComments</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>BaseForDocComments class</h1>
 
     
     <section>
@@ -242,7 +243,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class BaseForDocComments</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseForDocComments-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseForDocComments/BaseForDocComments.html">BaseForDocComments</a></li>
diff --git a/testing/test_package_docs/fake/BaseForDocComments/BaseForDocComments.html b/testing/test_package_docs/fake/BaseForDocComments/BaseForDocComments.html
index 9d74e7b41f..0fb8719f41 100644
--- a/testing/test_package_docs/fake/BaseForDocComments/BaseForDocComments.html
+++ b/testing/test_package_docs/fake/BaseForDocComments/BaseForDocComments.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
-    <li class="self-crumb">constructor BaseForDocComments</li>
+    <li class="self-crumb">BaseForDocComments constructor</li>
   </ol>
   <div class="self-name">BaseForDocComments</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class BaseForDocComments</h5>
+    <h5>BaseForDocComments class</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseForDocComments-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseForDocComments/BaseForDocComments.html">BaseForDocComments</a></li>
@@ -63,6 +63,8 @@ <h5>class BaseForDocComments</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>BaseForDocComments constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">BaseForDocComments</span>(<wbr>)
@@ -74,7 +76,6 @@ <h5>class BaseForDocComments</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor BaseForDocComments</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/BaseForDocComments/anotherMethod.html b/testing/test_package_docs/fake/BaseForDocComments/anotherMethod.html
index 7af730daea..6fb4e00101 100644
--- a/testing/test_package_docs/fake/BaseForDocComments/anotherMethod.html
+++ b/testing/test_package_docs/fake/BaseForDocComments/anotherMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
-    <li class="self-crumb">method anotherMethod</li>
+    <li class="self-crumb">anotherMethod method</li>
   </ol>
   <div class="self-name">anotherMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class BaseForDocComments</h5>
+    <h5>BaseForDocComments class</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseForDocComments-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseForDocComments/BaseForDocComments.html">BaseForDocComments</a></li>
@@ -63,6 +63,8 @@ <h5>class BaseForDocComments</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>anotherMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">anotherMethod</span>(<wbr>)
@@ -73,7 +75,6 @@ <h5>class BaseForDocComments</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method anotherMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/BaseForDocComments/doAwesomeStuff.html b/testing/test_package_docs/fake/BaseForDocComments/doAwesomeStuff.html
index 700c2f77fa..af727df02e 100644
--- a/testing/test_package_docs/fake/BaseForDocComments/doAwesomeStuff.html
+++ b/testing/test_package_docs/fake/BaseForDocComments/doAwesomeStuff.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
-    <li class="self-crumb">method doAwesomeStuff</li>
+    <li class="self-crumb">doAwesomeStuff method</li>
   </ol>
   <div class="self-name">doAwesomeStuff</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class BaseForDocComments</h5>
+    <h5>BaseForDocComments class</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseForDocComments-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseForDocComments/BaseForDocComments.html">BaseForDocComments</a></li>
@@ -63,6 +63,8 @@ <h5>class BaseForDocComments</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>doAwesomeStuff method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">doAwesomeStuff</span>(<wbr><span class="parameter" id="doAwesomeStuff-param-value"><span class="type-annotation">int</span> <span class="parameter-name">value</span></span>)
@@ -92,7 +94,6 @@ <h5>class BaseForDocComments</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method doAwesomeStuff</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/BaseForDocComments/hashCode.html b/testing/test_package_docs/fake/BaseForDocComments/hashCode.html
index 1fd4b7dad3..399401e321 100644
--- a/testing/test_package_docs/fake/BaseForDocComments/hashCode.html
+++ b/testing/test_package_docs/fake/BaseForDocComments/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class BaseForDocComments</h5>
+    <h5>BaseForDocComments class</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseForDocComments-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseForDocComments/BaseForDocComments.html">BaseForDocComments</a></li>
@@ -63,6 +63,8 @@ <h5>class BaseForDocComments</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -77,7 +79,6 @@ <h5>class BaseForDocComments</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/BaseForDocComments/noSuchMethod.html b/testing/test_package_docs/fake/BaseForDocComments/noSuchMethod.html
index d64d487815..a583fed70e 100644
--- a/testing/test_package_docs/fake/BaseForDocComments/noSuchMethod.html
+++ b/testing/test_package_docs/fake/BaseForDocComments/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class BaseForDocComments</h5>
+    <h5>BaseForDocComments class</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseForDocComments-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseForDocComments/BaseForDocComments.html">BaseForDocComments</a></li>
@@ -63,6 +63,8 @@ <h5>class BaseForDocComments</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -73,7 +75,6 @@ <h5>class BaseForDocComments</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/BaseForDocComments/operator_equals.html b/testing/test_package_docs/fake/BaseForDocComments/operator_equals.html
index 9e074b1fdf..aa7c93ff77 100644
--- a/testing/test_package_docs/fake/BaseForDocComments/operator_equals.html
+++ b/testing/test_package_docs/fake/BaseForDocComments/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class BaseForDocComments</h5>
+    <h5>BaseForDocComments class</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseForDocComments-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseForDocComments/BaseForDocComments.html">BaseForDocComments</a></li>
@@ -63,6 +63,8 @@ <h5>class BaseForDocComments</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -73,7 +75,6 @@ <h5>class BaseForDocComments</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/BaseForDocComments/runtimeType.html b/testing/test_package_docs/fake/BaseForDocComments/runtimeType.html
index 679014f0ae..16f33624de 100644
--- a/testing/test_package_docs/fake/BaseForDocComments/runtimeType.html
+++ b/testing/test_package_docs/fake/BaseForDocComments/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class BaseForDocComments</h5>
+    <h5>BaseForDocComments class</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseForDocComments-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseForDocComments/BaseForDocComments.html">BaseForDocComments</a></li>
@@ -63,6 +63,8 @@ <h5>class BaseForDocComments</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -77,7 +79,6 @@ <h5>class BaseForDocComments</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/BaseForDocComments/toString.html b/testing/test_package_docs/fake/BaseForDocComments/toString.html
index 8d8b4a1178..e20178f6b9 100644
--- a/testing/test_package_docs/fake/BaseForDocComments/toString.html
+++ b/testing/test_package_docs/fake/BaseForDocComments/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class BaseForDocComments</h5>
+    <h5>BaseForDocComments class</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseForDocComments-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseForDocComments/BaseForDocComments.html">BaseForDocComments</a></li>
@@ -63,6 +63,8 @@ <h5>class BaseForDocComments</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -73,7 +75,6 @@ <h5>class BaseForDocComments</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/BaseThingy-class.html b/testing/test_package_docs/fake/BaseThingy-class.html
index 7203feee33..f90ae6e952 100644
--- a/testing/test_package_docs/fake/BaseThingy-class.html
+++ b/testing/test_package_docs/fake/BaseThingy-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">abstract class BaseThingy</li>
+    <li class="self-crumb">BaseThingy abstract class</li>
   </ol>
   <div class="self-name">BaseThingy</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>BaseThingy class</h1>
 
     
     <section>
@@ -250,7 +251,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class BaseThingy</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseThingy-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseThingy/BaseThingy.html">BaseThingy</a></li>
diff --git a/testing/test_package_docs/fake/BaseThingy/BaseThingy.html b/testing/test_package_docs/fake/BaseThingy/BaseThingy.html
index 4af9cad29e..88b383b7e2 100644
--- a/testing/test_package_docs/fake/BaseThingy/BaseThingy.html
+++ b/testing/test_package_docs/fake/BaseThingy/BaseThingy.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
-    <li class="self-crumb">constructor BaseThingy</li>
+    <li class="self-crumb">BaseThingy constructor</li>
   </ol>
   <div class="self-name">BaseThingy</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class BaseThingy</h5>
+    <h5>BaseThingy class</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseThingy-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseThingy/BaseThingy.html">BaseThingy</a></li>
@@ -64,6 +64,8 @@ <h5>class BaseThingy</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>BaseThingy constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">BaseThingy</span>(<wbr>)
@@ -75,7 +77,6 @@ <h5>class BaseThingy</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor BaseThingy</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/BaseThingy/aImplementingThingy.html b/testing/test_package_docs/fake/BaseThingy/aImplementingThingy.html
index a273bd6df4..099fc255c6 100644
--- a/testing/test_package_docs/fake/BaseThingy/aImplementingThingy.html
+++ b/testing/test_package_docs/fake/BaseThingy/aImplementingThingy.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
-    <li class="self-crumb">property aImplementingThingy</li>
+    <li class="self-crumb">aImplementingThingy property</li>
   </ol>
   <div class="self-name">aImplementingThingy</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class BaseThingy</h5>
+    <h5>BaseThingy class</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseThingy-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseThingy/BaseThingy.html">BaseThingy</a></li>
@@ -64,6 +64,8 @@ <h5>class BaseThingy</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aImplementingThingy property</h1>
+
 
         <section id="getter">
         
@@ -78,7 +80,6 @@ <h5>class BaseThingy</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property aImplementingThingy</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/BaseThingy/aImplementingThingyField.html b/testing/test_package_docs/fake/BaseThingy/aImplementingThingyField.html
index dbb5e825d3..fd2859005e 100644
--- a/testing/test_package_docs/fake/BaseThingy/aImplementingThingyField.html
+++ b/testing/test_package_docs/fake/BaseThingy/aImplementingThingyField.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
-    <li class="self-crumb">property aImplementingThingyField</li>
+    <li class="self-crumb">aImplementingThingyField property</li>
   </ol>
   <div class="self-name">aImplementingThingyField</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class BaseThingy</h5>
+    <h5>BaseThingy class</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseThingy-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseThingy/BaseThingy.html">BaseThingy</a></li>
@@ -64,6 +64,8 @@ <h5>class BaseThingy</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aImplementingThingyField property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype"><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
           <span class="name ">aImplementingThingyField</span>          <div class="features">read / write</div>
@@ -73,7 +75,6 @@ <h5>class BaseThingy</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property aImplementingThingyField</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/BaseThingy/aImplementingThingyMethod.html b/testing/test_package_docs/fake/BaseThingy/aImplementingThingyMethod.html
index 7b9da4c980..7fe48cbb22 100644
--- a/testing/test_package_docs/fake/BaseThingy/aImplementingThingyMethod.html
+++ b/testing/test_package_docs/fake/BaseThingy/aImplementingThingyMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
-    <li class="self-crumb">abstract method aImplementingThingyMethod</li>
+    <li class="self-crumb">aImplementingThingyMethod abstract method</li>
   </ol>
   <div class="self-name">aImplementingThingyMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class BaseThingy</h5>
+    <h5>BaseThingy class</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseThingy-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseThingy/BaseThingy.html">BaseThingy</a></li>
@@ -64,6 +64,8 @@ <h5>class BaseThingy</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aImplementingThingyMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">aImplementingThingyMethod</span>(<wbr><span class="parameter" id="aImplementingThingyMethod-param-parameter"><span class="type-annotation"><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> <span class="parameter-name">parameter</span></span>)
@@ -74,7 +76,6 @@ <h5>class BaseThingy</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method aImplementingThingyMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/BaseThingy/hashCode.html b/testing/test_package_docs/fake/BaseThingy/hashCode.html
index bbd0b6e7b7..24106331d8 100644
--- a/testing/test_package_docs/fake/BaseThingy/hashCode.html
+++ b/testing/test_package_docs/fake/BaseThingy/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class BaseThingy</h5>
+    <h5>BaseThingy class</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseThingy-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseThingy/BaseThingy.html">BaseThingy</a></li>
@@ -64,6 +64,8 @@ <h5>class BaseThingy</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -78,7 +80,6 @@ <h5>class BaseThingy</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/BaseThingy/noSuchMethod.html b/testing/test_package_docs/fake/BaseThingy/noSuchMethod.html
index cf2d219df4..7b487f1108 100644
--- a/testing/test_package_docs/fake/BaseThingy/noSuchMethod.html
+++ b/testing/test_package_docs/fake/BaseThingy/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class BaseThingy</h5>
+    <h5>BaseThingy class</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseThingy-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseThingy/BaseThingy.html">BaseThingy</a></li>
@@ -64,6 +64,8 @@ <h5>class BaseThingy</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -74,7 +76,6 @@ <h5>class BaseThingy</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/BaseThingy/operator_equals.html b/testing/test_package_docs/fake/BaseThingy/operator_equals.html
index 272af4f2cc..36a62f1450 100644
--- a/testing/test_package_docs/fake/BaseThingy/operator_equals.html
+++ b/testing/test_package_docs/fake/BaseThingy/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class BaseThingy</h5>
+    <h5>BaseThingy class</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseThingy-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseThingy/BaseThingy.html">BaseThingy</a></li>
@@ -64,6 +64,8 @@ <h5>class BaseThingy</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -74,7 +76,6 @@ <h5>class BaseThingy</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/BaseThingy/runtimeType.html b/testing/test_package_docs/fake/BaseThingy/runtimeType.html
index 47b8473beb..dd9717fc4a 100644
--- a/testing/test_package_docs/fake/BaseThingy/runtimeType.html
+++ b/testing/test_package_docs/fake/BaseThingy/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class BaseThingy</h5>
+    <h5>BaseThingy class</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseThingy-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseThingy/BaseThingy.html">BaseThingy</a></li>
@@ -64,6 +64,8 @@ <h5>class BaseThingy</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -78,7 +80,6 @@ <h5>class BaseThingy</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/BaseThingy/toString.html b/testing/test_package_docs/fake/BaseThingy/toString.html
index 502004b2cc..aa980b6f7f 100644
--- a/testing/test_package_docs/fake/BaseThingy/toString.html
+++ b/testing/test_package_docs/fake/BaseThingy/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class BaseThingy</h5>
+    <h5>BaseThingy class</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseThingy-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseThingy/BaseThingy.html">BaseThingy</a></li>
@@ -64,6 +64,8 @@ <h5>class BaseThingy</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -74,7 +76,6 @@ <h5>class BaseThingy</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/BaseThingy2-class.html b/testing/test_package_docs/fake/BaseThingy2-class.html
index 2e89b6230e..e0bd64a3b5 100644
--- a/testing/test_package_docs/fake/BaseThingy2-class.html
+++ b/testing/test_package_docs/fake/BaseThingy2-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">abstract class BaseThingy2</li>
+    <li class="self-crumb">BaseThingy2 abstract class</li>
   </ol>
   <div class="self-name">BaseThingy2</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>BaseThingy2 class</h1>
 
     <section class="desc markdown">
       <p>Test for MultiplyInheritedExecutableElement handling.</p>
@@ -258,7 +259,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class BaseThingy2</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseThingy2-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseThingy2/BaseThingy2.html">BaseThingy2</a></li>
diff --git a/testing/test_package_docs/fake/BaseThingy2/BaseThingy2.html b/testing/test_package_docs/fake/BaseThingy2/BaseThingy2.html
index abdae084a8..44e017e998 100644
--- a/testing/test_package_docs/fake/BaseThingy2/BaseThingy2.html
+++ b/testing/test_package_docs/fake/BaseThingy2/BaseThingy2.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
-    <li class="self-crumb">constructor BaseThingy2</li>
+    <li class="self-crumb">BaseThingy2 constructor</li>
   </ol>
   <div class="self-name">BaseThingy2</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class BaseThingy2</h5>
+    <h5>BaseThingy2 class</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseThingy2-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseThingy2/BaseThingy2.html">BaseThingy2</a></li>
@@ -64,6 +64,8 @@ <h5>class BaseThingy2</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>BaseThingy2 constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">BaseThingy2</span>(<wbr>)
@@ -75,7 +77,6 @@ <h5>class BaseThingy2</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor BaseThingy2</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/BaseThingy2/aImplementingThingy.html b/testing/test_package_docs/fake/BaseThingy2/aImplementingThingy.html
index 3c392e9215..9c040fef82 100644
--- a/testing/test_package_docs/fake/BaseThingy2/aImplementingThingy.html
+++ b/testing/test_package_docs/fake/BaseThingy2/aImplementingThingy.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
-    <li class="self-crumb">property aImplementingThingy</li>
+    <li class="self-crumb">aImplementingThingy property</li>
   </ol>
   <div class="self-name">aImplementingThingy</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class BaseThingy2</h5>
+    <h5>BaseThingy2 class</h5>
     <ol>
       <li class="section-title"><a href="fake/BaseThingy2-class.html#constructors">Constructors</a></li>
       <li><a href="fake/BaseThingy2/BaseThingy2.html">BaseThingy2</a></li>
@@ -64,6 +64,8 @@ <h5>class BaseThingy2</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aImplementingThingy property</h1>
+
 
         <section id="getter">
         
@@ -81,7 +83,6 @@ <h5>class BaseThingy2</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property aImplementingThingy</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html b/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html
index e5b7c64b12..475c011f36 100644
--- a/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html
+++ b/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">constant CUSTOM_CLASS</li>
+    <li class="self-crumb">CUSTOM_CLASS constant</li>
   </ol>
   <div class="self-name">CUSTOM_CLASS</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>CUSTOM_CLASS top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name ">CUSTOM_CLASS</span>      =
@@ -140,7 +141,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property CUSTOM_CLASS</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Callback2.html b/testing/test_package_docs/fake/Callback2.html
index c920752e27..116a47c4a7 100644
--- a/testing/test_package_docs/fake/Callback2.html
+++ b/testing/test_package_docs/fake/Callback2.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">typedef Callback2</li>
+    <li class="self-crumb">Callback2 typedef</li>
   </ol>
   <div class="self-name">Callback2</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Callback2 typedef</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">int</span>
@@ -139,7 +140,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>typedef Callback2</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html b/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
index fcbc28f141..ab25adfd27 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class ClassWithUnusualProperties</li>
+    <li class="self-crumb">ClassWithUnusualProperties class</li>
   </ol>
   <div class="self-name">ClassWithUnusualProperties</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ClassWithUnusualProperties class</h1>
 
     <section class="desc markdown">
       <p>Classes with unusual properties?  I don't think they exist.</p>
@@ -336,7 +337,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class ClassWithUnusualProperties</h5>
     <ol>
       <li class="section-title"><a href="fake/ClassWithUnusualProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ClassWithUnusualProperties/ClassWithUnusualProperties.html">ClassWithUnusualProperties</a></li>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/ClassWithUnusualProperties.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/ClassWithUnusualProperties.html
index 988ccd2c96..e6ff1e3249 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/ClassWithUnusualProperties.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/ClassWithUnusualProperties.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
-    <li class="self-crumb">constructor ClassWithUnusualProperties</li>
+    <li class="self-crumb">ClassWithUnusualProperties constructor</li>
   </ol>
   <div class="self-name">ClassWithUnusualProperties</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ClassWithUnusualProperties</h5>
+    <h5>ClassWithUnusualProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ClassWithUnusualProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ClassWithUnusualProperties/ClassWithUnusualProperties.html">ClassWithUnusualProperties</a></li>
@@ -74,6 +74,8 @@ <h5>class ClassWithUnusualProperties</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ClassWithUnusualProperties constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">ClassWithUnusualProperties</span>(<wbr>)
@@ -85,7 +87,6 @@ <h5>class ClassWithUnusualProperties</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor ClassWithUnusualProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/aMethod.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/aMethod.html
index 64606d6a78..db974b1b6a 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/aMethod.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/aMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
-    <li class="self-crumb">method aMethod</li>
+    <li class="self-crumb">aMethod method</li>
   </ol>
   <div class="self-name">aMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ClassWithUnusualProperties</h5>
+    <h5>ClassWithUnusualProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ClassWithUnusualProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ClassWithUnusualProperties/ClassWithUnusualProperties.html">ClassWithUnusualProperties</a></li>
@@ -74,6 +74,8 @@ <h5>class ClassWithUnusualProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">aMethod</span>(<wbr><span class="parameter" id="aMethod-param-f"><span class="type-annotation">Function</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-x"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">x</span>, </span> <span class="parameter" id="f-param-q"><span class="type-annotation">bool</span> <span class="parameter-name">q</span></span>)</span>)
@@ -87,7 +89,6 @@ <h5>class ClassWithUnusualProperties</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method aMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/documentedPartialFieldInSubclassOnly.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/documentedPartialFieldInSubclassOnly.html
index d740ebe8b3..5142460e46 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/documentedPartialFieldInSubclassOnly.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/documentedPartialFieldInSubclassOnly.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
-    <li class="self-crumb">property documentedPartialFieldInSubclassOnly</li>
+    <li class="self-crumb">documentedPartialFieldInSubclassOnly property</li>
   </ol>
   <div class="self-name">documentedPartialFieldInSubclassOnly</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ClassWithUnusualProperties</h5>
+    <h5>ClassWithUnusualProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ClassWithUnusualProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ClassWithUnusualProperties/ClassWithUnusualProperties.html">ClassWithUnusualProperties</a></li>
@@ -74,6 +74,8 @@ <h5>class ClassWithUnusualProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>documentedPartialFieldInSubclassOnly property</h1>
+
 
         <section id="getter">
         
@@ -104,7 +106,6 @@ <h5>class ClassWithUnusualProperties</h5>
           </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property documentedPartialFieldInSubclassOnly</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetter.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetter.html
index 5baa6abeac..ed2c8ce053 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetter.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
-    <li class="self-crumb">property explicitGetter</li>
+    <li class="self-crumb">explicitGetter property</li>
   </ol>
   <div class="self-name">explicitGetter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ClassWithUnusualProperties</h5>
+    <h5>ClassWithUnusualProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ClassWithUnusualProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ClassWithUnusualProperties/ClassWithUnusualProperties.html">ClassWithUnusualProperties</a></li>
@@ -74,6 +74,8 @@ <h5>class ClassWithUnusualProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>explicitGetter property</h1>
+
 
         <section id="getter">
         
@@ -91,7 +93,6 @@ <h5>class ClassWithUnusualProperties</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property explicitGetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterImplicitSetter.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterImplicitSetter.html
index a7837b05b9..406dbe9bab 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterImplicitSetter.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterImplicitSetter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
-    <li class="self-crumb">property explicitGetterImplicitSetter</li>
+    <li class="self-crumb">explicitGetterImplicitSetter property</li>
   </ol>
   <div class="self-name">explicitGetterImplicitSetter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ClassWithUnusualProperties</h5>
+    <h5>ClassWithUnusualProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ClassWithUnusualProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ClassWithUnusualProperties/ClassWithUnusualProperties.html">ClassWithUnusualProperties</a></li>
@@ -74,6 +74,8 @@ <h5>class ClassWithUnusualProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>explicitGetterImplicitSetter property</h1>
+
 
         <section id="getter">
         
@@ -104,7 +106,6 @@ <h5>class ClassWithUnusualProperties</h5>
           </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property explicitGetterImplicitSetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterSetter.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterSetter.html
index a7a06dafeb..e5d6b05899 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterSetter.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterSetter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
-    <li class="self-crumb">property explicitGetterSetter</li>
+    <li class="self-crumb">explicitGetterSetter property</li>
   </ol>
   <div class="self-name">explicitGetterSetter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ClassWithUnusualProperties</h5>
+    <h5>ClassWithUnusualProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ClassWithUnusualProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ClassWithUnusualProperties/ClassWithUnusualProperties.html">ClassWithUnusualProperties</a></li>
@@ -74,6 +74,8 @@ <h5>class ClassWithUnusualProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>explicitGetterSetter property</h1>
+
 
         <section id="getter">
         
@@ -104,7 +106,6 @@ <h5>class ClassWithUnusualProperties</h5>
           </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property explicitGetterSetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitNonDocumentedInBaseClassGetter.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitNonDocumentedInBaseClassGetter.html
index d12b31fd6f..c990b73098 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitNonDocumentedInBaseClassGetter.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitNonDocumentedInBaseClassGetter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
-    <li class="self-crumb">property explicitNonDocumentedInBaseClassGetter</li>
+    <li class="self-crumb">explicitNonDocumentedInBaseClassGetter property</li>
   </ol>
   <div class="self-name">explicitNonDocumentedInBaseClassGetter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ClassWithUnusualProperties</h5>
+    <h5>ClassWithUnusualProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ClassWithUnusualProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ClassWithUnusualProperties/ClassWithUnusualProperties.html">ClassWithUnusualProperties</a></li>
@@ -74,6 +74,8 @@ <h5>class ClassWithUnusualProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>explicitNonDocumentedInBaseClassGetter property</h1>
+
 
         <section id="getter">
         
@@ -91,7 +93,6 @@ <h5>class ClassWithUnusualProperties</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property explicitNonDocumentedInBaseClassGetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitSetter.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitSetter.html
index 4ed3c7e2c1..0009ff23ca 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitSetter.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitSetter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
-    <li class="self-crumb">property explicitSetter</li>
+    <li class="self-crumb">explicitSetter property</li>
   </ol>
   <div class="self-name">explicitSetter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ClassWithUnusualProperties</h5>
+    <h5>ClassWithUnusualProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ClassWithUnusualProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ClassWithUnusualProperties/ClassWithUnusualProperties.html">ClassWithUnusualProperties</a></li>
@@ -74,6 +74,8 @@ <h5>class ClassWithUnusualProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>explicitSetter property</h1>
+
 
 
         <section id="setter">
@@ -92,7 +94,6 @@ <h5>class ClassWithUnusualProperties</h5>
           </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property explicitSetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/finalProperty.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/finalProperty.html
index cbff8299cd..ab4f2bfc54 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/finalProperty.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/finalProperty.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
-    <li class="self-crumb">property finalProperty</li>
+    <li class="self-crumb">finalProperty property</li>
   </ol>
   <div class="self-name">finalProperty</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ClassWithUnusualProperties</h5>
+    <h5>ClassWithUnusualProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ClassWithUnusualProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ClassWithUnusualProperties/ClassWithUnusualProperties.html">ClassWithUnusualProperties</a></li>
@@ -74,6 +74,8 @@ <h5>class ClassWithUnusualProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>finalProperty property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">Set</span>
           <span class="name ">finalProperty</span>          <div class="features">final</div>
@@ -86,7 +88,6 @@ <h5>class ClassWithUnusualProperties</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property finalProperty</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/implicitGetterExplicitSetter.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/implicitGetterExplicitSetter.html
index f1e6242987..152b4e6193 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/implicitGetterExplicitSetter.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/implicitGetterExplicitSetter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
-    <li class="self-crumb">property implicitGetterExplicitSetter</li>
+    <li class="self-crumb">implicitGetterExplicitSetter property</li>
   </ol>
   <div class="self-name">implicitGetterExplicitSetter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ClassWithUnusualProperties</h5>
+    <h5>ClassWithUnusualProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ClassWithUnusualProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ClassWithUnusualProperties/ClassWithUnusualProperties.html">ClassWithUnusualProperties</a></li>
@@ -74,6 +74,8 @@ <h5>class ClassWithUnusualProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>implicitGetterExplicitSetter property</h1>
+
 
         <section id="getter">
         
@@ -104,7 +106,6 @@ <h5>class ClassWithUnusualProperties</h5>
           </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property implicitGetterExplicitSetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/implicitReadWrite.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/implicitReadWrite.html
index d3e6e8c182..a4acc49fd5 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/implicitReadWrite.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/implicitReadWrite.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
-    <li class="self-crumb">property implicitReadWrite</li>
+    <li class="self-crumb">implicitReadWrite property</li>
   </ol>
   <div class="self-name">implicitReadWrite</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ClassWithUnusualProperties</h5>
+    <h5>ClassWithUnusualProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ClassWithUnusualProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ClassWithUnusualProperties/ClassWithUnusualProperties.html">ClassWithUnusualProperties</a></li>
@@ -74,6 +74,8 @@ <h5>class ClassWithUnusualProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>implicitReadWrite property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">Map</span>
           <span class="name ">implicitReadWrite</span>          <div class="features">read / write</div>
@@ -83,7 +85,6 @@ <h5>class ClassWithUnusualProperties</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property implicitReadWrite</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Color-class.html b/testing/test_package_docs/fake/Color-class.html
index a3a99f7428..e88e0ebf11 100644
--- a/testing/test_package_docs/fake/Color-class.html
+++ b/testing/test_package_docs/fake/Color-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">enum Color</li>
+    <li class="self-crumb">Color enum</li>
   </ol>
   <div class="self-name">Color</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Color enum</h1>
 
     <section class="desc markdown">
       <p>An <code>enum</code> for ROYGBIV constants.</p>
@@ -307,7 +308,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>enum Color</h5>
     <ol>
       <li class="section-title"><a href="fake/Color-class.html#constants">Constants</a></li>
       <li>BLUE</li>
diff --git a/testing/test_package_docs/fake/Color/hashCode.html b/testing/test_package_docs/fake/Color/hashCode.html
index 7d34e6e77e..bcd07d7634 100644
--- a/testing/test_package_docs/fake/Color/hashCode.html
+++ b/testing/test_package_docs/fake/Color/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Color-class.html">Color</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>enum Color</h5>
+    <h5>Color enum</h5>
     <ol>
     
       <li class="section-title">
@@ -69,6 +69,8 @@ <h5>enum Color</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -83,7 +85,6 @@ <h5>enum Color</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Color/noSuchMethod.html b/testing/test_package_docs/fake/Color/noSuchMethod.html
index 705d87c7ed..802d1d2891 100644
--- a/testing/test_package_docs/fake/Color/noSuchMethod.html
+++ b/testing/test_package_docs/fake/Color/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Color-class.html">Color</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>enum Color</h5>
+    <h5>Color enum</h5>
     <ol>
     
       <li class="section-title">
@@ -69,6 +69,8 @@ <h5>enum Color</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -79,7 +81,6 @@ <h5>enum Color</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Color/operator_equals.html b/testing/test_package_docs/fake/Color/operator_equals.html
index e1da3528d3..40fef06bc9 100644
--- a/testing/test_package_docs/fake/Color/operator_equals.html
+++ b/testing/test_package_docs/fake/Color/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Color-class.html">Color</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>enum Color</h5>
+    <h5>Color enum</h5>
     <ol>
     
       <li class="section-title">
@@ -69,6 +69,8 @@ <h5>enum Color</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -79,7 +81,6 @@ <h5>enum Color</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Color/runtimeType.html b/testing/test_package_docs/fake/Color/runtimeType.html
index bcb4aed0e1..e47dd5a69c 100644
--- a/testing/test_package_docs/fake/Color/runtimeType.html
+++ b/testing/test_package_docs/fake/Color/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Color-class.html">Color</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>enum Color</h5>
+    <h5>Color enum</h5>
     <ol>
     
       <li class="section-title">
@@ -69,6 +69,8 @@ <h5>enum Color</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -83,7 +85,6 @@ <h5>enum Color</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Color/toString.html b/testing/test_package_docs/fake/Color/toString.html
index 632397121f..470164257c 100644
--- a/testing/test_package_docs/fake/Color/toString.html
+++ b/testing/test_package_docs/fake/Color/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Color-class.html">Color</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>enum Color</h5>
+    <h5>Color enum</h5>
     <ol>
     
       <li class="section-title">
@@ -69,6 +69,8 @@ <h5>enum Color</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -79,7 +81,6 @@ <h5>enum Color</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ConstantClass-class.html b/testing/test_package_docs/fake/ConstantClass-class.html
index 67e72354d3..10d8dbfba7 100644
--- a/testing/test_package_docs/fake/ConstantClass-class.html
+++ b/testing/test_package_docs/fake/ConstantClass-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class ConstantClass</li>
+    <li class="self-crumb">ConstantClass class</li>
   </ol>
   <div class="self-name">ConstantClass</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ConstantClass class</h1>
 
     <section class="desc markdown">
       <p>For make-better testing of constants.</p>
@@ -244,7 +245,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class ConstantClass</h5>
     <ol>
       <li class="section-title"><a href="fake/ConstantClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ConstantClass/ConstantClass.html">ConstantClass</a></li>
diff --git a/testing/test_package_docs/fake/ConstantClass/ConstantClass.html b/testing/test_package_docs/fake/ConstantClass/ConstantClass.html
index 6a03fc14a7..a933773673 100644
--- a/testing/test_package_docs/fake/ConstantClass/ConstantClass.html
+++ b/testing/test_package_docs/fake/ConstantClass/ConstantClass.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
-    <li class="self-crumb">const constructor ConstantClass</li>
+    <li class="self-crumb">ConstantClass const constructor</li>
   </ol>
   <div class="self-name">ConstantClass</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ConstantClass</h5>
+    <h5>ConstantClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/ConstantClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ConstantClass/ConstantClass.html">ConstantClass</a></li>
@@ -64,6 +64,8 @@ <h5>class ConstantClass</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ConstantClass constructor</h1>
+
     <section class="multi-line-signature">
       const
       <span class="name ">ConstantClass</span>(<wbr><span class="parameter" id="-param-value"><span class="type-annotation">String</span> <span class="parameter-name">value</span></span>)
@@ -79,7 +81,6 @@ <h5>class ConstantClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor ConstantClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ConstantClass/ConstantClass.isVeryConstant.html b/testing/test_package_docs/fake/ConstantClass/ConstantClass.isVeryConstant.html
index 362b0a51ba..9926db9d6e 100644
--- a/testing/test_package_docs/fake/ConstantClass/ConstantClass.isVeryConstant.html
+++ b/testing/test_package_docs/fake/ConstantClass/ConstantClass.isVeryConstant.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
-    <li class="self-crumb">const constructor ConstantClass.isVeryConstant</li>
+    <li class="self-crumb">ConstantClass.isVeryConstant const constructor</li>
   </ol>
   <div class="self-name">ConstantClass.isVeryConstant</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ConstantClass</h5>
+    <h5>ConstantClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/ConstantClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ConstantClass/ConstantClass.html">ConstantClass</a></li>
@@ -64,6 +64,8 @@ <h5>class ConstantClass</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ConstantClass.isVeryConstant constructor</h1>
+
     <section class="multi-line-signature">
       const
       <span class="name ">ConstantClass.isVeryConstant</span>(<wbr><span class="parameter" id="isVeryConstant-param-value"><span class="type-annotation">String</span> <span class="parameter-name">value</span></span>)
@@ -78,7 +80,6 @@ <h5>class ConstantClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor ConstantClass.isVeryConstant</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ConstantClass/ConstantClass.notConstant.html b/testing/test_package_docs/fake/ConstantClass/ConstantClass.notConstant.html
index 1256943286..6069d61d38 100644
--- a/testing/test_package_docs/fake/ConstantClass/ConstantClass.notConstant.html
+++ b/testing/test_package_docs/fake/ConstantClass/ConstantClass.notConstant.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
-    <li class="self-crumb">constructor ConstantClass.notConstant</li>
+    <li class="self-crumb">ConstantClass.notConstant constructor</li>
   </ol>
   <div class="self-name">ConstantClass.notConstant</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ConstantClass</h5>
+    <h5>ConstantClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/ConstantClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ConstantClass/ConstantClass.html">ConstantClass</a></li>
@@ -64,6 +64,8 @@ <h5>class ConstantClass</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ConstantClass.notConstant constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">ConstantClass.notConstant</span>(<wbr><span class="parameter" id="notConstant-param-value"><span class="type-annotation">String</span> <span class="parameter-name">value</span></span>)
@@ -78,7 +80,6 @@ <h5>class ConstantClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor ConstantClass.notConstant</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ConstantClass/hashCode.html b/testing/test_package_docs/fake/ConstantClass/hashCode.html
index 69ab809fc2..63cb71a08b 100644
--- a/testing/test_package_docs/fake/ConstantClass/hashCode.html
+++ b/testing/test_package_docs/fake/ConstantClass/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ConstantClass</h5>
+    <h5>ConstantClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/ConstantClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ConstantClass/ConstantClass.html">ConstantClass</a></li>
@@ -64,6 +64,8 @@ <h5>class ConstantClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -78,7 +80,6 @@ <h5>class ConstantClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ConstantClass/noSuchMethod.html b/testing/test_package_docs/fake/ConstantClass/noSuchMethod.html
index 531513241e..0e2b733ad9 100644
--- a/testing/test_package_docs/fake/ConstantClass/noSuchMethod.html
+++ b/testing/test_package_docs/fake/ConstantClass/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ConstantClass</h5>
+    <h5>ConstantClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/ConstantClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ConstantClass/ConstantClass.html">ConstantClass</a></li>
@@ -64,6 +64,8 @@ <h5>class ConstantClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -74,7 +76,6 @@ <h5>class ConstantClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ConstantClass/operator_equals.html b/testing/test_package_docs/fake/ConstantClass/operator_equals.html
index 9310b24253..ac1162503b 100644
--- a/testing/test_package_docs/fake/ConstantClass/operator_equals.html
+++ b/testing/test_package_docs/fake/ConstantClass/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ConstantClass</h5>
+    <h5>ConstantClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/ConstantClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ConstantClass/ConstantClass.html">ConstantClass</a></li>
@@ -64,6 +64,8 @@ <h5>class ConstantClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -74,7 +76,6 @@ <h5>class ConstantClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ConstantClass/runtimeType.html b/testing/test_package_docs/fake/ConstantClass/runtimeType.html
index a66f7d16f1..944df36ef7 100644
--- a/testing/test_package_docs/fake/ConstantClass/runtimeType.html
+++ b/testing/test_package_docs/fake/ConstantClass/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ConstantClass</h5>
+    <h5>ConstantClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/ConstantClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ConstantClass/ConstantClass.html">ConstantClass</a></li>
@@ -64,6 +64,8 @@ <h5>class ConstantClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -78,7 +80,6 @@ <h5>class ConstantClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ConstantClass/toString.html b/testing/test_package_docs/fake/ConstantClass/toString.html
index 47e711192a..03f1e6cb53 100644
--- a/testing/test_package_docs/fake/ConstantClass/toString.html
+++ b/testing/test_package_docs/fake/ConstantClass/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ConstantClass</h5>
+    <h5>ConstantClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/ConstantClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ConstantClass/ConstantClass.html">ConstantClass</a></li>
@@ -64,6 +64,8 @@ <h5>class ConstantClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -74,7 +76,6 @@ <h5>class ConstantClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ConstantClass/value.html b/testing/test_package_docs/fake/ConstantClass/value.html
index 36f6463b5e..b61d510216 100644
--- a/testing/test_package_docs/fake/ConstantClass/value.html
+++ b/testing/test_package_docs/fake/ConstantClass/value.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
-    <li class="self-crumb">property value</li>
+    <li class="self-crumb">value property</li>
   </ol>
   <div class="self-name">value</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ConstantClass</h5>
+    <h5>ConstantClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/ConstantClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ConstantClass/ConstantClass.html">ConstantClass</a></li>
@@ -64,6 +64,8 @@ <h5>class ConstantClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>value property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">String</span>
           <span class="name ">value</span>          <div class="features">final</div>
@@ -73,7 +75,6 @@ <h5>class ConstantClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property value</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ConstructorTester-class.html b/testing/test_package_docs/fake/ConstructorTester-class.html
index fda0fdafd1..f09d17ecf7 100644
--- a/testing/test_package_docs/fake/ConstructorTester-class.html
+++ b/testing/test_package_docs/fake/ConstructorTester-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class ConstructorTester<span class="signature">&lt;A, B&gt;</span></li>
+    <li class="self-crumb">ConstructorTester<span class="signature">&lt;A, B&gt;</span> class</li>
   </ol>
   <div class="self-name">ConstructorTester</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ConstructorTester&lt;A, B&gt; class</h1>
 
     
 
@@ -218,7 +219,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class ConstructorTester</h5>
     <ol>
       <li class="section-title"><a href="fake/ConstructorTester-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ConstructorTester/ConstructorTester.html">ConstructorTester</a></li>
diff --git a/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.fromSomething.html b/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.fromSomething.html
index 6f48e2afe2..9b483a5a81 100644
--- a/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.fromSomething.html
+++ b/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.fromSomething.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
-    <li class="self-crumb">constructor ConstructorTester.fromSomething</li>
+    <li class="self-crumb">ConstructorTester.fromSomething constructor</li>
   </ol>
   <div class="self-name">ConstructorTester.fromSomething</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ConstructorTester</h5>
+    <h5>ConstructorTester class</h5>
     <ol>
       <li class="section-title"><a href="fake/ConstructorTester-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ConstructorTester/ConstructorTester.html">ConstructorTester</a></li>
@@ -62,6 +62,8 @@ <h5>class ConstructorTester</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ConstructorTester&lt;A, B&gt;.fromSomething constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">ConstructorTester&lt;A, B&gt;.fromSomething</span>(<wbr><span class="parameter" id="fromSomething-param-foo"><span class="type-annotation">A</span> <span class="parameter-name">foo</span></span>)
@@ -73,7 +75,6 @@ <h5>class ConstructorTester</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor ConstructorTester.fromSomething</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.html b/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.html
index 60b78882de..c3027f9211 100644
--- a/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.html
+++ b/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
-    <li class="self-crumb">constructor ConstructorTester</li>
+    <li class="self-crumb">ConstructorTester constructor</li>
   </ol>
   <div class="self-name">ConstructorTester</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ConstructorTester</h5>
+    <h5>ConstructorTester class</h5>
     <ol>
       <li class="section-title"><a href="fake/ConstructorTester-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ConstructorTester/ConstructorTester.html">ConstructorTester</a></li>
@@ -62,6 +62,8 @@ <h5>class ConstructorTester</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ConstructorTester&lt;A, B&gt; constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">ConstructorTester&lt;A, B&gt;</span>(<wbr><span class="parameter" id="-param-param1"><span class="type-annotation">String</span> <span class="parameter-name">param1</span></span>)
@@ -73,7 +75,6 @@ <h5>class ConstructorTester</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor ConstructorTester</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ConstructorTester/hashCode.html b/testing/test_package_docs/fake/ConstructorTester/hashCode.html
index f133a7c3c4..6bdda73ace 100644
--- a/testing/test_package_docs/fake/ConstructorTester/hashCode.html
+++ b/testing/test_package_docs/fake/ConstructorTester/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ConstructorTester</h5>
+    <h5>ConstructorTester class</h5>
     <ol>
       <li class="section-title"><a href="fake/ConstructorTester-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ConstructorTester/ConstructorTester.html">ConstructorTester</a></li>
@@ -62,6 +62,8 @@ <h5>class ConstructorTester</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class ConstructorTester</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ConstructorTester/noSuchMethod.html b/testing/test_package_docs/fake/ConstructorTester/noSuchMethod.html
index 8fc486cdd4..74b6569069 100644
--- a/testing/test_package_docs/fake/ConstructorTester/noSuchMethod.html
+++ b/testing/test_package_docs/fake/ConstructorTester/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ConstructorTester</h5>
+    <h5>ConstructorTester class</h5>
     <ol>
       <li class="section-title"><a href="fake/ConstructorTester-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ConstructorTester/ConstructorTester.html">ConstructorTester</a></li>
@@ -62,6 +62,8 @@ <h5>class ConstructorTester</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -72,7 +74,6 @@ <h5>class ConstructorTester</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ConstructorTester/operator_equals.html b/testing/test_package_docs/fake/ConstructorTester/operator_equals.html
index f93f1f6581..86dd557368 100644
--- a/testing/test_package_docs/fake/ConstructorTester/operator_equals.html
+++ b/testing/test_package_docs/fake/ConstructorTester/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ConstructorTester</h5>
+    <h5>ConstructorTester class</h5>
     <ol>
       <li class="section-title"><a href="fake/ConstructorTester-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ConstructorTester/ConstructorTester.html">ConstructorTester</a></li>
@@ -62,6 +62,8 @@ <h5>class ConstructorTester</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -72,7 +74,6 @@ <h5>class ConstructorTester</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ConstructorTester/runtimeType.html b/testing/test_package_docs/fake/ConstructorTester/runtimeType.html
index dfdcd9c526..8229b8ad04 100644
--- a/testing/test_package_docs/fake/ConstructorTester/runtimeType.html
+++ b/testing/test_package_docs/fake/ConstructorTester/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ConstructorTester</h5>
+    <h5>ConstructorTester class</h5>
     <ol>
       <li class="section-title"><a href="fake/ConstructorTester-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ConstructorTester/ConstructorTester.html">ConstructorTester</a></li>
@@ -62,6 +62,8 @@ <h5>class ConstructorTester</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class ConstructorTester</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ConstructorTester/toString.html b/testing/test_package_docs/fake/ConstructorTester/toString.html
index ac333d43e5..00e5aa489b 100644
--- a/testing/test_package_docs/fake/ConstructorTester/toString.html
+++ b/testing/test_package_docs/fake/ConstructorTester/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ConstructorTester</h5>
+    <h5>ConstructorTester class</h5>
     <ol>
       <li class="section-title"><a href="fake/ConstructorTester-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ConstructorTester/ConstructorTester.html">ConstructorTester</a></li>
@@ -62,6 +62,8 @@ <h5>class ConstructorTester</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class ConstructorTester</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Cool-class.html b/testing/test_package_docs/fake/Cool-class.html
index 2d5a1cad5c..cd14e19a52 100644
--- a/testing/test_package_docs/fake/Cool-class.html
+++ b/testing/test_package_docs/fake/Cool-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class Cool</li>
+    <li class="self-crumb">Cool class</li>
   </ol>
   <div class="self-name">Cool</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Cool class</h1>
 
     <section class="desc markdown">
       <p>This class is cool!</p>
@@ -224,7 +225,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class Cool</h5>
     <ol>
       <li class="section-title"><a href="fake/Cool-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Cool/Cool.html">Cool</a></li>
diff --git a/testing/test_package_docs/fake/Cool/Cool.html b/testing/test_package_docs/fake/Cool/Cool.html
index 7b6721f8db..1e0fd9bae0 100644
--- a/testing/test_package_docs/fake/Cool/Cool.html
+++ b/testing/test_package_docs/fake/Cool/Cool.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Cool-class.html">Cool</a></li>
-    <li class="self-crumb">constructor Cool</li>
+    <li class="self-crumb">Cool constructor</li>
   </ol>
   <div class="self-name">Cool</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Cool</h5>
+    <h5>Cool class</h5>
     <ol>
       <li class="section-title"><a href="fake/Cool-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Cool/Cool.html">Cool</a></li>
@@ -62,6 +62,8 @@ <h5>class Cool</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Cool constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">Cool</span>(<wbr>)
@@ -73,7 +75,6 @@ <h5>class Cool</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor Cool</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Cool/hashCode.html b/testing/test_package_docs/fake/Cool/hashCode.html
index 3c407a3cab..5137faf83f 100644
--- a/testing/test_package_docs/fake/Cool/hashCode.html
+++ b/testing/test_package_docs/fake/Cool/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Cool-class.html">Cool</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Cool</h5>
+    <h5>Cool class</h5>
     <ol>
       <li class="section-title"><a href="fake/Cool-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Cool/Cool.html">Cool</a></li>
@@ -62,6 +62,8 @@ <h5>class Cool</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class Cool</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Cool/noSuchMethod.html b/testing/test_package_docs/fake/Cool/noSuchMethod.html
index 41c7b04196..ca59d4af13 100644
--- a/testing/test_package_docs/fake/Cool/noSuchMethod.html
+++ b/testing/test_package_docs/fake/Cool/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Cool-class.html">Cool</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Cool</h5>
+    <h5>Cool class</h5>
     <ol>
       <li class="section-title"><a href="fake/Cool-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Cool/Cool.html">Cool</a></li>
@@ -62,6 +62,8 @@ <h5>class Cool</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -72,7 +74,6 @@ <h5>class Cool</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Cool/operator_equals.html b/testing/test_package_docs/fake/Cool/operator_equals.html
index 89832620df..b7e5dda8af 100644
--- a/testing/test_package_docs/fake/Cool/operator_equals.html
+++ b/testing/test_package_docs/fake/Cool/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Cool-class.html">Cool</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Cool</h5>
+    <h5>Cool class</h5>
     <ol>
       <li class="section-title"><a href="fake/Cool-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Cool/Cool.html">Cool</a></li>
@@ -62,6 +62,8 @@ <h5>class Cool</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -72,7 +74,6 @@ <h5>class Cool</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Cool/returnCool.html b/testing/test_package_docs/fake/Cool/returnCool.html
index 50840b5ead..606b4e2fd8 100644
--- a/testing/test_package_docs/fake/Cool/returnCool.html
+++ b/testing/test_package_docs/fake/Cool/returnCool.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Cool-class.html">Cool</a></li>
-    <li class="self-crumb">method returnCool</li>
+    <li class="self-crumb">returnCool method</li>
   </ol>
   <div class="self-name">returnCool</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Cool</h5>
+    <h5>Cool class</h5>
     <ol>
       <li class="section-title"><a href="fake/Cool-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Cool/Cool.html">Cool</a></li>
@@ -62,6 +62,8 @@ <h5>class Cool</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>returnCool method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype"><a href="fake/Cool-class.html">Cool</a></span>
       <span class="name ">returnCool</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class Cool</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method returnCool</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Cool/runtimeType.html b/testing/test_package_docs/fake/Cool/runtimeType.html
index 7eae5586b1..0609a3d905 100644
--- a/testing/test_package_docs/fake/Cool/runtimeType.html
+++ b/testing/test_package_docs/fake/Cool/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Cool-class.html">Cool</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Cool</h5>
+    <h5>Cool class</h5>
     <ol>
       <li class="section-title"><a href="fake/Cool-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Cool/Cool.html">Cool</a></li>
@@ -62,6 +62,8 @@ <h5>class Cool</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class Cool</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Cool/toString.html b/testing/test_package_docs/fake/Cool/toString.html
index 93a5da41e3..e760168fd3 100644
--- a/testing/test_package_docs/fake/Cool/toString.html
+++ b/testing/test_package_docs/fake/Cool/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Cool-class.html">Cool</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Cool</h5>
+    <h5>Cool class</h5>
     <ol>
       <li class="section-title"><a href="fake/Cool-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Cool/Cool.html">Cool</a></li>
@@ -62,6 +62,8 @@ <h5>class Cool</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class Cool</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/DOWN-constant.html b/testing/test_package_docs/fake/DOWN-constant.html
index 74e16d3ebb..d3c1c24a70 100644
--- a/testing/test_package_docs/fake/DOWN-constant.html
+++ b/testing/test_package_docs/fake/DOWN-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">constant <span class="deprecated">DOWN</span></li>
+    <li class="self-crumb"><span class="deprecated">DOWN</span> constant</li>
   </ol>
   <div class="self-name">DOWN</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>DOWN top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name deprecated">DOWN</span>      =
@@ -143,7 +144,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property DOWN</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/DocumentWithATable-class.html b/testing/test_package_docs/fake/DocumentWithATable-class.html
index 5b06a2f836..c3a41664f8 100644
--- a/testing/test_package_docs/fake/DocumentWithATable-class.html
+++ b/testing/test_package_docs/fake/DocumentWithATable-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class DocumentWithATable</li>
+    <li class="self-crumb">DocumentWithATable class</li>
   </ol>
   <div class="self-name">DocumentWithATable</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>DocumentWithATable class</h1>
 
     <section class="desc markdown">
       <p>This is a class with a table.</p>
@@ -256,7 +257,6 @@ <h2>Constants</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class DocumentWithATable</h5>
     <ol>
       <li class="section-title"><a href="fake/DocumentWithATable-class.html#constructors">Constructors</a></li>
       <li><a href="fake/DocumentWithATable/DocumentWithATable.html">DocumentWithATable</a></li>
diff --git a/testing/test_package_docs/fake/DocumentWithATable/DocumentWithATable.html b/testing/test_package_docs/fake/DocumentWithATable/DocumentWithATable.html
index 7e80a7f4fc..8ff03dcfbc 100644
--- a/testing/test_package_docs/fake/DocumentWithATable/DocumentWithATable.html
+++ b/testing/test_package_docs/fake/DocumentWithATable/DocumentWithATable.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
-    <li class="self-crumb">const constructor DocumentWithATable</li>
+    <li class="self-crumb">DocumentWithATable const constructor</li>
   </ol>
   <div class="self-name">DocumentWithATable</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class DocumentWithATable</h5>
+    <h5>DocumentWithATable class</h5>
     <ol>
       <li class="section-title"><a href="fake/DocumentWithATable-class.html#constructors">Constructors</a></li>
       <li><a href="fake/DocumentWithATable/DocumentWithATable.html">DocumentWithATable</a></li>
@@ -65,6 +65,8 @@ <h5>class DocumentWithATable</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>DocumentWithATable constructor</h1>
+
     <section class="multi-line-signature">
       const
       <span class="name ">DocumentWithATable</span>(<wbr>)
@@ -76,7 +78,6 @@ <h5>class DocumentWithATable</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor DocumentWithATable</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/DocumentWithATable/aMethod.html b/testing/test_package_docs/fake/DocumentWithATable/aMethod.html
index 2ba784587c..f9d2fbcb45 100644
--- a/testing/test_package_docs/fake/DocumentWithATable/aMethod.html
+++ b/testing/test_package_docs/fake/DocumentWithATable/aMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
-    <li class="self-crumb">method aMethod</li>
+    <li class="self-crumb">aMethod method</li>
   </ol>
   <div class="self-name">aMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class DocumentWithATable</h5>
+    <h5>DocumentWithATable class</h5>
     <ol>
       <li class="section-title"><a href="fake/DocumentWithATable-class.html#constructors">Constructors</a></li>
       <li><a href="fake/DocumentWithATable/DocumentWithATable.html">DocumentWithATable</a></li>
@@ -65,6 +65,8 @@ <h5>class DocumentWithATable</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">aMethod</span>(<wbr><span class="parameter" id="aMethod-param-parameter"><span class="type-annotation">String</span> <span class="parameter-name">parameter</span></span>)
@@ -75,7 +77,6 @@ <h5>class DocumentWithATable</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method aMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/DocumentWithATable/bar-constant.html b/testing/test_package_docs/fake/DocumentWithATable/bar-constant.html
index ffd2bea68b..cd455d7499 100644
--- a/testing/test_package_docs/fake/DocumentWithATable/bar-constant.html
+++ b/testing/test_package_docs/fake/DocumentWithATable/bar-constant.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
-    <li class="self-crumb">constant bar</li>
+    <li class="self-crumb">bar constant</li>
   </ol>
   <div class="self-name">bar</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class DocumentWithATable</h5>
+    <h5>DocumentWithATable class</h5>
     <ol>
       <li class="section-title"><a href="fake/DocumentWithATable-class.html#constructors">Constructors</a></li>
       <li><a href="fake/DocumentWithATable/DocumentWithATable.html">DocumentWithATable</a></li>
@@ -65,6 +65,7 @@ <h5>class DocumentWithATable</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>bar property</h1>
 
     <section class="multi-line-signature">
         <span class="returntype"><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></span>
@@ -77,7 +78,6 @@ <h5>class DocumentWithATable</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property bar</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/DocumentWithATable/foo-constant.html b/testing/test_package_docs/fake/DocumentWithATable/foo-constant.html
index a9d09be32a..6742f36c60 100644
--- a/testing/test_package_docs/fake/DocumentWithATable/foo-constant.html
+++ b/testing/test_package_docs/fake/DocumentWithATable/foo-constant.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
-    <li class="self-crumb">constant foo</li>
+    <li class="self-crumb">foo constant</li>
   </ol>
   <div class="self-name">foo</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class DocumentWithATable</h5>
+    <h5>DocumentWithATable class</h5>
     <ol>
       <li class="section-title"><a href="fake/DocumentWithATable-class.html#constructors">Constructors</a></li>
       <li><a href="fake/DocumentWithATable/DocumentWithATable.html">DocumentWithATable</a></li>
@@ -65,6 +65,7 @@ <h5>class DocumentWithATable</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>foo property</h1>
 
     <section class="multi-line-signature">
         <span class="returntype"><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></span>
@@ -77,7 +78,6 @@ <h5>class DocumentWithATable</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property foo</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/DocumentWithATable/hashCode.html b/testing/test_package_docs/fake/DocumentWithATable/hashCode.html
index b0f13a836a..f2ca71e624 100644
--- a/testing/test_package_docs/fake/DocumentWithATable/hashCode.html
+++ b/testing/test_package_docs/fake/DocumentWithATable/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class DocumentWithATable</h5>
+    <h5>DocumentWithATable class</h5>
     <ol>
       <li class="section-title"><a href="fake/DocumentWithATable-class.html#constructors">Constructors</a></li>
       <li><a href="fake/DocumentWithATable/DocumentWithATable.html">DocumentWithATable</a></li>
@@ -65,6 +65,8 @@ <h5>class DocumentWithATable</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -79,7 +81,6 @@ <h5>class DocumentWithATable</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/DocumentWithATable/noSuchMethod.html b/testing/test_package_docs/fake/DocumentWithATable/noSuchMethod.html
index a503d43d77..1601fc447d 100644
--- a/testing/test_package_docs/fake/DocumentWithATable/noSuchMethod.html
+++ b/testing/test_package_docs/fake/DocumentWithATable/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class DocumentWithATable</h5>
+    <h5>DocumentWithATable class</h5>
     <ol>
       <li class="section-title"><a href="fake/DocumentWithATable-class.html#constructors">Constructors</a></li>
       <li><a href="fake/DocumentWithATable/DocumentWithATable.html">DocumentWithATable</a></li>
@@ -65,6 +65,8 @@ <h5>class DocumentWithATable</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -75,7 +77,6 @@ <h5>class DocumentWithATable</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/DocumentWithATable/operator_equals.html b/testing/test_package_docs/fake/DocumentWithATable/operator_equals.html
index 846bfe7583..7a613a0f74 100644
--- a/testing/test_package_docs/fake/DocumentWithATable/operator_equals.html
+++ b/testing/test_package_docs/fake/DocumentWithATable/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class DocumentWithATable</h5>
+    <h5>DocumentWithATable class</h5>
     <ol>
       <li class="section-title"><a href="fake/DocumentWithATable-class.html#constructors">Constructors</a></li>
       <li><a href="fake/DocumentWithATable/DocumentWithATable.html">DocumentWithATable</a></li>
@@ -65,6 +65,8 @@ <h5>class DocumentWithATable</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -75,7 +77,6 @@ <h5>class DocumentWithATable</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/DocumentWithATable/runtimeType.html b/testing/test_package_docs/fake/DocumentWithATable/runtimeType.html
index c19f214ffe..d916a1c72b 100644
--- a/testing/test_package_docs/fake/DocumentWithATable/runtimeType.html
+++ b/testing/test_package_docs/fake/DocumentWithATable/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class DocumentWithATable</h5>
+    <h5>DocumentWithATable class</h5>
     <ol>
       <li class="section-title"><a href="fake/DocumentWithATable-class.html#constructors">Constructors</a></li>
       <li><a href="fake/DocumentWithATable/DocumentWithATable.html">DocumentWithATable</a></li>
@@ -65,6 +65,8 @@ <h5>class DocumentWithATable</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -79,7 +81,6 @@ <h5>class DocumentWithATable</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/DocumentWithATable/toString.html b/testing/test_package_docs/fake/DocumentWithATable/toString.html
index 7695e9ab07..6d8724aff5 100644
--- a/testing/test_package_docs/fake/DocumentWithATable/toString.html
+++ b/testing/test_package_docs/fake/DocumentWithATable/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class DocumentWithATable</h5>
+    <h5>DocumentWithATable class</h5>
     <ol>
       <li class="section-title"><a href="fake/DocumentWithATable-class.html#constructors">Constructors</a></li>
       <li><a href="fake/DocumentWithATable/DocumentWithATable.html">DocumentWithATable</a></li>
@@ -65,6 +65,8 @@ <h5>class DocumentWithATable</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -75,7 +77,6 @@ <h5>class DocumentWithATable</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Doh-class.html b/testing/test_package_docs/fake/Doh-class.html
index 32e5aee28c..e233940a57 100644
--- a/testing/test_package_docs/fake/Doh-class.html
+++ b/testing/test_package_docs/fake/Doh-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class <span class="deprecated">Doh</span></li>
+    <li class="self-crumb"><span class="deprecated">Doh</span> class</li>
   </ol>
   <div class="self-name">Doh</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Doh class</h1>
 
     <section class="desc markdown">
       <p>Also, my bad.</p>
@@ -241,7 +242,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class Doh</h5>
     <ol>
       <li class="section-title"><a href="fake/Doh-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Doh/Doh.html">Doh</a></li>
diff --git a/testing/test_package_docs/fake/Doh/Doh.html b/testing/test_package_docs/fake/Doh/Doh.html
index 7022e31984..67ec194036 100644
--- a/testing/test_package_docs/fake/Doh/Doh.html
+++ b/testing/test_package_docs/fake/Doh/Doh.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Doh-class.html">Doh</a></li>
-    <li class="self-crumb">constructor Doh</li>
+    <li class="self-crumb">Doh constructor</li>
   </ol>
   <div class="self-name">Doh</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Doh</h5>
+    <h5>Doh class</h5>
     <ol>
       <li class="section-title"><a href="fake/Doh-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Doh/Doh.html">Doh</a></li>
@@ -62,6 +62,8 @@ <h5>class Doh</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Doh constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">Doh</span>(<wbr>)
@@ -73,7 +75,6 @@ <h5>class Doh</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor Doh</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Doh/hashCode.html b/testing/test_package_docs/fake/Doh/hashCode.html
index 68eb91eb2f..da5d68e6bd 100644
--- a/testing/test_package_docs/fake/Doh/hashCode.html
+++ b/testing/test_package_docs/fake/Doh/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Doh-class.html">Doh</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Doh</h5>
+    <h5>Doh class</h5>
     <ol>
       <li class="section-title"><a href="fake/Doh-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Doh/Doh.html">Doh</a></li>
@@ -62,6 +62,8 @@ <h5>class Doh</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class Doh</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Doh/noSuchMethod.html b/testing/test_package_docs/fake/Doh/noSuchMethod.html
index 53a088e7da..677c841ade 100644
--- a/testing/test_package_docs/fake/Doh/noSuchMethod.html
+++ b/testing/test_package_docs/fake/Doh/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Doh-class.html">Doh</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Doh</h5>
+    <h5>Doh class</h5>
     <ol>
       <li class="section-title"><a href="fake/Doh-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Doh/Doh.html">Doh</a></li>
@@ -62,6 +62,8 @@ <h5>class Doh</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -72,7 +74,6 @@ <h5>class Doh</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Doh/operator_equals.html b/testing/test_package_docs/fake/Doh/operator_equals.html
index 580f5dff40..201e4d9256 100644
--- a/testing/test_package_docs/fake/Doh/operator_equals.html
+++ b/testing/test_package_docs/fake/Doh/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Doh-class.html">Doh</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Doh</h5>
+    <h5>Doh class</h5>
     <ol>
       <li class="section-title"><a href="fake/Doh-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Doh/Doh.html">Doh</a></li>
@@ -62,6 +62,8 @@ <h5>class Doh</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -72,7 +74,6 @@ <h5>class Doh</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Doh/runtimeType.html b/testing/test_package_docs/fake/Doh/runtimeType.html
index bfc5e8110c..8871e17dc9 100644
--- a/testing/test_package_docs/fake/Doh/runtimeType.html
+++ b/testing/test_package_docs/fake/Doh/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Doh-class.html">Doh</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Doh</h5>
+    <h5>Doh class</h5>
     <ol>
       <li class="section-title"><a href="fake/Doh-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Doh/Doh.html">Doh</a></li>
@@ -62,6 +62,8 @@ <h5>class Doh</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class Doh</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Doh/stackTrace.html b/testing/test_package_docs/fake/Doh/stackTrace.html
index 5c7a9876be..8f7b291e63 100644
--- a/testing/test_package_docs/fake/Doh/stackTrace.html
+++ b/testing/test_package_docs/fake/Doh/stackTrace.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Doh-class.html">Doh</a></li>
-    <li class="self-crumb">property stackTrace</li>
+    <li class="self-crumb">stackTrace property</li>
   </ol>
   <div class="self-name">stackTrace</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Doh</h5>
+    <h5>Doh class</h5>
     <ol>
       <li class="section-title"><a href="fake/Doh-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Doh/Doh.html">Doh</a></li>
@@ -62,6 +62,8 @@ <h5>class Doh</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>stackTrace property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class Doh</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property stackTrace</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Doh/toString.html b/testing/test_package_docs/fake/Doh/toString.html
index 95361c25e6..73da58e252 100644
--- a/testing/test_package_docs/fake/Doh/toString.html
+++ b/testing/test_package_docs/fake/Doh/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Doh-class.html">Doh</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Doh</h5>
+    <h5>Doh class</h5>
     <ol>
       <li class="section-title"><a href="fake/Doh-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Doh/Doh.html">Doh</a></li>
@@ -62,6 +62,8 @@ <h5>class Doh</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class Doh</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ExtraSpecialList-class.html b/testing/test_package_docs/fake/ExtraSpecialList-class.html
index 0d216846c8..27f74cbe57 100644
--- a/testing/test_package_docs/fake/ExtraSpecialList-class.html
+++ b/testing/test_package_docs/fake/ExtraSpecialList-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class ExtraSpecialList<span class="signature">&lt;E&gt;</span></li>
+    <li class="self-crumb">ExtraSpecialList<span class="signature">&lt;E&gt;</span> class</li>
   </ol>
   <div class="self-name">ExtraSpecialList</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ExtraSpecialList&lt;E&gt; class</h1>
 
     <section class="desc markdown">
       <p>This inherits operators.</p>
@@ -690,7 +691,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class ExtraSpecialList</h5>
     <ol>
       <li class="section-title"><a href="fake/ExtraSpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ExtraSpecialList/ExtraSpecialList.html">ExtraSpecialList</a></li>
diff --git a/testing/test_package_docs/fake/ExtraSpecialList/ExtraSpecialList.html b/testing/test_package_docs/fake/ExtraSpecialList/ExtraSpecialList.html
index 13d7be4357..ea60385080 100644
--- a/testing/test_package_docs/fake/ExtraSpecialList/ExtraSpecialList.html
+++ b/testing/test_package_docs/fake/ExtraSpecialList/ExtraSpecialList.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">constructor ExtraSpecialList</li>
+    <li class="self-crumb">ExtraSpecialList constructor</li>
   </ol>
   <div class="self-name">ExtraSpecialList</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ExtraSpecialList</h5>
+    <h5>ExtraSpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/ExtraSpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ExtraSpecialList/ExtraSpecialList.html">ExtraSpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class ExtraSpecialList</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ExtraSpecialList&lt;E&gt; constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">ExtraSpecialList&lt;E&gt;</span>(<wbr>)
@@ -124,7 +126,6 @@ <h5>class ExtraSpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor ExtraSpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/FakeProcesses.html b/testing/test_package_docs/fake/FakeProcesses.html
index 5680e0842e..4f5267dd08 100644
--- a/testing/test_package_docs/fake/FakeProcesses.html
+++ b/testing/test_package_docs/fake/FakeProcesses.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">typedef <span class="deprecated">FakeProcesses</span></li>
+    <li class="self-crumb"><span class="deprecated">FakeProcesses</span> typedef</li>
   </ol>
   <div class="self-name">FakeProcesses</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>FakeProcesses typedef</h1>
 
     <section class="multi-line-signature">
         <div>
@@ -147,7 +148,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>typedef FakeProcesses</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Foo2-class.html b/testing/test_package_docs/fake/Foo2-class.html
index 9f876747f9..9f7c5e4428 100644
--- a/testing/test_package_docs/fake/Foo2-class.html
+++ b/testing/test_package_docs/fake/Foo2-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class Foo2</li>
+    <li class="self-crumb">Foo2 class</li>
   </ol>
   <div class="self-name">Foo2</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Foo2 class</h1>
 
     <section class="desc markdown">
       <p>link to method from class <a href="ex/Apple/m.html">Apple.m</a></p>
@@ -252,7 +253,6 @@ <h2>Constants</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class Foo2</h5>
     <ol>
       <li class="section-title"><a href="fake/Foo2-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Foo2/Foo2.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/Foo2/BAR-constant.html b/testing/test_package_docs/fake/Foo2/BAR-constant.html
index a98c445f3b..82db9b3d6d 100644
--- a/testing/test_package_docs/fake/Foo2/BAR-constant.html
+++ b/testing/test_package_docs/fake/Foo2/BAR-constant.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Foo2-class.html">Foo2</a></li>
-    <li class="self-crumb">constant BAR</li>
+    <li class="self-crumb">BAR constant</li>
   </ol>
   <div class="self-name">BAR</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Foo2</h5>
+    <h5>Foo2 class</h5>
     <ol>
       <li class="section-title"><a href="fake/Foo2-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Foo2/Foo2.html">Foo2</a></li>
@@ -65,6 +65,7 @@ <h5>class Foo2</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>BAR property</h1>
 
     <section class="multi-line-signature">
         <span class="returntype"><a href="fake/Foo2-class.html">Foo2</a></span>
@@ -77,7 +78,6 @@ <h5>class Foo2</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property BAR</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Foo2/BAZ-constant.html b/testing/test_package_docs/fake/Foo2/BAZ-constant.html
index cdc98176ee..a02075ead0 100644
--- a/testing/test_package_docs/fake/Foo2/BAZ-constant.html
+++ b/testing/test_package_docs/fake/Foo2/BAZ-constant.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Foo2-class.html">Foo2</a></li>
-    <li class="self-crumb">constant BAZ</li>
+    <li class="self-crumb">BAZ constant</li>
   </ol>
   <div class="self-name">BAZ</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Foo2</h5>
+    <h5>Foo2 class</h5>
     <ol>
       <li class="section-title"><a href="fake/Foo2-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Foo2/Foo2.html">Foo2</a></li>
@@ -65,6 +65,7 @@ <h5>class Foo2</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>BAZ property</h1>
 
     <section class="multi-line-signature">
         <span class="returntype"><a href="fake/Foo2-class.html">Foo2</a></span>
@@ -77,7 +78,6 @@ <h5>class Foo2</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property BAZ</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Foo2/Foo2.html b/testing/test_package_docs/fake/Foo2/Foo2.html
index e0615abece..0ad8601ae0 100644
--- a/testing/test_package_docs/fake/Foo2/Foo2.html
+++ b/testing/test_package_docs/fake/Foo2/Foo2.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Foo2-class.html">Foo2</a></li>
-    <li class="self-crumb">const constructor Foo2</li>
+    <li class="self-crumb">Foo2 const constructor</li>
   </ol>
   <div class="self-name">Foo2</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Foo2</h5>
+    <h5>Foo2 class</h5>
     <ol>
       <li class="section-title"><a href="fake/Foo2-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Foo2/Foo2.html">Foo2</a></li>
@@ -65,6 +65,8 @@ <h5>class Foo2</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Foo2 constructor</h1>
+
     <section class="multi-line-signature">
       const
       <span class="name ">Foo2</span>(<wbr><span class="parameter" id="-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span></span>)
@@ -76,7 +78,6 @@ <h5>class Foo2</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor Foo2</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Foo2/hashCode.html b/testing/test_package_docs/fake/Foo2/hashCode.html
index fc0f16a4cc..948498b9a3 100644
--- a/testing/test_package_docs/fake/Foo2/hashCode.html
+++ b/testing/test_package_docs/fake/Foo2/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Foo2-class.html">Foo2</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Foo2</h5>
+    <h5>Foo2 class</h5>
     <ol>
       <li class="section-title"><a href="fake/Foo2-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Foo2/Foo2.html">Foo2</a></li>
@@ -65,6 +65,8 @@ <h5>class Foo2</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -79,7 +81,6 @@ <h5>class Foo2</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Foo2/index.html b/testing/test_package_docs/fake/Foo2/index.html
index ff211d19fc..017cb2db31 100644
--- a/testing/test_package_docs/fake/Foo2/index.html
+++ b/testing/test_package_docs/fake/Foo2/index.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Foo2-class.html">Foo2</a></li>
-    <li class="self-crumb">property index</li>
+    <li class="self-crumb">index property</li>
   </ol>
   <div class="self-name">index</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Foo2</h5>
+    <h5>Foo2 class</h5>
     <ol>
       <li class="section-title"><a href="fake/Foo2-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Foo2/Foo2.html">Foo2</a></li>
@@ -65,6 +65,8 @@ <h5>class Foo2</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>index property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">int</span>
           <span class="name ">index</span>          <div class="features">final</div>
@@ -74,7 +76,6 @@ <h5>class Foo2</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property index</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Foo2/noSuchMethod.html b/testing/test_package_docs/fake/Foo2/noSuchMethod.html
index cdc9f1a613..c4e1ab77ae 100644
--- a/testing/test_package_docs/fake/Foo2/noSuchMethod.html
+++ b/testing/test_package_docs/fake/Foo2/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Foo2-class.html">Foo2</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Foo2</h5>
+    <h5>Foo2 class</h5>
     <ol>
       <li class="section-title"><a href="fake/Foo2-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Foo2/Foo2.html">Foo2</a></li>
@@ -65,6 +65,8 @@ <h5>class Foo2</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -75,7 +77,6 @@ <h5>class Foo2</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Foo2/operator_equals.html b/testing/test_package_docs/fake/Foo2/operator_equals.html
index 829570d3ca..a83961db9d 100644
--- a/testing/test_package_docs/fake/Foo2/operator_equals.html
+++ b/testing/test_package_docs/fake/Foo2/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Foo2-class.html">Foo2</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Foo2</h5>
+    <h5>Foo2 class</h5>
     <ol>
       <li class="section-title"><a href="fake/Foo2-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Foo2/Foo2.html">Foo2</a></li>
@@ -65,6 +65,8 @@ <h5>class Foo2</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -75,7 +77,6 @@ <h5>class Foo2</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Foo2/runtimeType.html b/testing/test_package_docs/fake/Foo2/runtimeType.html
index 5578f05cbc..99e6645a56 100644
--- a/testing/test_package_docs/fake/Foo2/runtimeType.html
+++ b/testing/test_package_docs/fake/Foo2/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Foo2-class.html">Foo2</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Foo2</h5>
+    <h5>Foo2 class</h5>
     <ol>
       <li class="section-title"><a href="fake/Foo2-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Foo2/Foo2.html">Foo2</a></li>
@@ -65,6 +65,8 @@ <h5>class Foo2</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -79,7 +81,6 @@ <h5>class Foo2</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Foo2/toString.html b/testing/test_package_docs/fake/Foo2/toString.html
index e51daf789d..af568841d1 100644
--- a/testing/test_package_docs/fake/Foo2/toString.html
+++ b/testing/test_package_docs/fake/Foo2/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Foo2-class.html">Foo2</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Foo2</h5>
+    <h5>Foo2 class</h5>
     <ol>
       <li class="section-title"><a href="fake/Foo2-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Foo2/Foo2.html">Foo2</a></li>
@@ -65,6 +65,8 @@ <h5>class Foo2</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -75,7 +77,6 @@ <h5>class Foo2</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/GenericTypedef.html b/testing/test_package_docs/fake/GenericTypedef.html
index 5b4427ce7c..646becf500 100644
--- a/testing/test_package_docs/fake/GenericTypedef.html
+++ b/testing/test_package_docs/fake/GenericTypedef.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">typedef GenericTypedef&lt;T&gt;</li>
+    <li class="self-crumb">GenericTypedef&lt;T&gt; typedef</li>
   </ol>
   <div class="self-name">GenericTypedef</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>GenericTypedef&lt;T&gt; typedef</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">T</span>
@@ -142,7 +143,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>typedef GenericTypedef</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends-class.html b/testing/test_package_docs/fake/HasGenericWithExtends-class.html
index 7cfb69742c..cca64cc8b6 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends-class.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class HasGenericWithExtends<span class="signature">&lt;T extends <a href="fake/Foo2-class.html">Foo2</a>&gt;</span></li>
+    <li class="self-crumb">HasGenericWithExtends<span class="signature">&lt;T extends <a href="fake/Foo2-class.html">Foo2</a>&gt;</span> class</li>
   </ol>
   <div class="self-name">HasGenericWithExtends</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>HasGenericWithExtends&lt;T extends Foo2&gt; class</h1>
 
     <section class="desc markdown">
       <p>I have a generic and it extends <a href="fake/Foo2-class.html">Foo2</a></p>
@@ -215,7 +216,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class HasGenericWithExtends</h5>
     <ol>
       <li class="section-title"><a href="fake/HasGenericWithExtends-class.html#constructors">Constructors</a></li>
       <li><a href="fake/HasGenericWithExtends/HasGenericWithExtends.html">HasGenericWithExtends</a></li>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/HasGenericWithExtends.html b/testing/test_package_docs/fake/HasGenericWithExtends/HasGenericWithExtends.html
index bbb115d206..7d040b2172 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends/HasGenericWithExtends.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends/HasGenericWithExtends.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;T extends Foo2&gt;</span></a></li>
-    <li class="self-crumb">constructor HasGenericWithExtends</li>
+    <li class="self-crumb">HasGenericWithExtends constructor</li>
   </ol>
   <div class="self-name">HasGenericWithExtends</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasGenericWithExtends</h5>
+    <h5>HasGenericWithExtends class</h5>
     <ol>
       <li class="section-title"><a href="fake/HasGenericWithExtends-class.html#constructors">Constructors</a></li>
       <li><a href="fake/HasGenericWithExtends/HasGenericWithExtends.html">HasGenericWithExtends</a></li>
@@ -61,6 +61,8 @@ <h5>class HasGenericWithExtends</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>HasGenericWithExtends&lt;T extends Foo2&gt; constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">HasGenericWithExtends&lt;T extends Foo2&gt;</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class HasGenericWithExtends</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor HasGenericWithExtends</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/hashCode.html b/testing/test_package_docs/fake/HasGenericWithExtends/hashCode.html
index 1741da0095..308ef063e6 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends/hashCode.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;T extends Foo2&gt;</span></a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasGenericWithExtends</h5>
+    <h5>HasGenericWithExtends class</h5>
     <ol>
       <li class="section-title"><a href="fake/HasGenericWithExtends-class.html#constructors">Constructors</a></li>
       <li><a href="fake/HasGenericWithExtends/HasGenericWithExtends.html">HasGenericWithExtends</a></li>
@@ -61,6 +61,8 @@ <h5>class HasGenericWithExtends</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class HasGenericWithExtends</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/noSuchMethod.html b/testing/test_package_docs/fake/HasGenericWithExtends/noSuchMethod.html
index a352135a36..02339c2986 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends/noSuchMethod.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;T extends Foo2&gt;</span></a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasGenericWithExtends</h5>
+    <h5>HasGenericWithExtends class</h5>
     <ol>
       <li class="section-title"><a href="fake/HasGenericWithExtends-class.html#constructors">Constructors</a></li>
       <li><a href="fake/HasGenericWithExtends/HasGenericWithExtends.html">HasGenericWithExtends</a></li>
@@ -61,6 +61,8 @@ <h5>class HasGenericWithExtends</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -71,7 +73,6 @@ <h5>class HasGenericWithExtends</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/operator_equals.html b/testing/test_package_docs/fake/HasGenericWithExtends/operator_equals.html
index e47099012b..4ebb4c75fe 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends/operator_equals.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;T extends Foo2&gt;</span></a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasGenericWithExtends</h5>
+    <h5>HasGenericWithExtends class</h5>
     <ol>
       <li class="section-title"><a href="fake/HasGenericWithExtends-class.html#constructors">Constructors</a></li>
       <li><a href="fake/HasGenericWithExtends/HasGenericWithExtends.html">HasGenericWithExtends</a></li>
@@ -61,6 +61,8 @@ <h5>class HasGenericWithExtends</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -71,7 +73,6 @@ <h5>class HasGenericWithExtends</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/runtimeType.html b/testing/test_package_docs/fake/HasGenericWithExtends/runtimeType.html
index 86c0bcf24e..a8927038cf 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends/runtimeType.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;T extends Foo2&gt;</span></a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasGenericWithExtends</h5>
+    <h5>HasGenericWithExtends class</h5>
     <ol>
       <li class="section-title"><a href="fake/HasGenericWithExtends-class.html#constructors">Constructors</a></li>
       <li><a href="fake/HasGenericWithExtends/HasGenericWithExtends.html">HasGenericWithExtends</a></li>
@@ -61,6 +61,8 @@ <h5>class HasGenericWithExtends</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class HasGenericWithExtends</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/toString.html b/testing/test_package_docs/fake/HasGenericWithExtends/toString.html
index f78526776c..be95585189 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends/toString.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;T extends Foo2&gt;</span></a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasGenericWithExtends</h5>
+    <h5>HasGenericWithExtends class</h5>
     <ol>
       <li class="section-title"><a href="fake/HasGenericWithExtends-class.html#constructors">Constructors</a></li>
       <li><a href="fake/HasGenericWithExtends/HasGenericWithExtends.html">HasGenericWithExtends</a></li>
@@ -61,6 +61,8 @@ <h5>class HasGenericWithExtends</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -71,7 +73,6 @@ <h5>class HasGenericWithExtends</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/HasGenerics-class.html b/testing/test_package_docs/fake/HasGenerics-class.html
index 07535f63f0..58c8d1b406 100644
--- a/testing/test_package_docs/fake/HasGenerics-class.html
+++ b/testing/test_package_docs/fake/HasGenerics-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></li>
+    <li class="self-crumb">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span> class</li>
   </ol>
   <div class="self-name">HasGenerics</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>HasGenerics&lt;X, Y, Z&gt; class</h1>
 
     
 
@@ -248,7 +249,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class HasGenerics</h5>
     <ol>
       <li class="section-title"><a href="fake/HasGenerics-class.html#constructors">Constructors</a></li>
       <li><a href="fake/HasGenerics/HasGenerics.html">HasGenerics</a></li>
diff --git a/testing/test_package_docs/fake/HasGenerics/HasGenerics.html b/testing/test_package_docs/fake/HasGenerics/HasGenerics.html
index 4549241d41..16a5e59737 100644
--- a/testing/test_package_docs/fake/HasGenerics/HasGenerics.html
+++ b/testing/test_package_docs/fake/HasGenerics/HasGenerics.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
-    <li class="self-crumb">constructor HasGenerics</li>
+    <li class="self-crumb">HasGenerics constructor</li>
   </ol>
   <div class="self-name">HasGenerics</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasGenerics</h5>
+    <h5>HasGenerics class</h5>
     <ol>
       <li class="section-title"><a href="fake/HasGenerics-class.html#constructors">Constructors</a></li>
       <li><a href="fake/HasGenerics/HasGenerics.html">HasGenerics</a></li>
@@ -65,6 +65,8 @@ <h5>class HasGenerics</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>HasGenerics&lt;X, Y, Z&gt; constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">HasGenerics&lt;X, Y, Z&gt;</span>(<wbr><span class="parameter" id="-param-x"><span class="type-annotation">X</span> <span class="parameter-name">x</span>, </span> <span class="parameter" id="-param-y"><span class="type-annotation">Y</span> <span class="parameter-name">y</span>, </span> <span class="parameter" id="-param-z"><span class="type-annotation">Z</span> <span class="parameter-name">z</span></span>)
@@ -76,7 +78,6 @@ <h5>class HasGenerics</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor HasGenerics</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/HasGenerics/convertToMap.html b/testing/test_package_docs/fake/HasGenerics/convertToMap.html
index 23006a6d63..b3a157ef0c 100644
--- a/testing/test_package_docs/fake/HasGenerics/convertToMap.html
+++ b/testing/test_package_docs/fake/HasGenerics/convertToMap.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
-    <li class="self-crumb">method convertToMap</li>
+    <li class="self-crumb">convertToMap method</li>
   </ol>
   <div class="self-name">convertToMap</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasGenerics</h5>
+    <h5>HasGenerics class</h5>
     <ol>
       <li class="section-title"><a href="fake/HasGenerics-class.html#constructors">Constructors</a></li>
       <li><a href="fake/HasGenerics/HasGenerics.html">HasGenerics</a></li>
@@ -65,6 +65,8 @@ <h5>class HasGenerics</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>convertToMap method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Map<span class="signature">&lt;X, Y&gt;</span></span>
       <span class="name ">convertToMap</span>(<wbr>)
@@ -78,7 +80,6 @@ <h5>class HasGenerics</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method convertToMap</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/HasGenerics/doStuff.html b/testing/test_package_docs/fake/HasGenerics/doStuff.html
index 2580176d70..84356e9189 100644
--- a/testing/test_package_docs/fake/HasGenerics/doStuff.html
+++ b/testing/test_package_docs/fake/HasGenerics/doStuff.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
-    <li class="self-crumb">method doStuff</li>
+    <li class="self-crumb">doStuff method</li>
   </ol>
   <div class="self-name">doStuff</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasGenerics</h5>
+    <h5>HasGenerics class</h5>
     <ol>
       <li class="section-title"><a href="fake/HasGenerics-class.html#constructors">Constructors</a></li>
       <li><a href="fake/HasGenerics/HasGenerics.html">HasGenerics</a></li>
@@ -65,6 +65,8 @@ <h5>class HasGenerics</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>doStuff method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Z</span>
       <span class="name ">doStuff</span>(<wbr><span class="parameter" id="doStuff-param-s"><span class="type-annotation">String</span> <span class="parameter-name">s</span>, </span> <span class="parameter" id="doStuff-param-x"><span class="type-annotation">X</span> <span class="parameter-name">x</span></span>)
@@ -75,7 +77,6 @@ <h5>class HasGenerics</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method doStuff</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/HasGenerics/hashCode.html b/testing/test_package_docs/fake/HasGenerics/hashCode.html
index 5bd19f5d09..5410c8c464 100644
--- a/testing/test_package_docs/fake/HasGenerics/hashCode.html
+++ b/testing/test_package_docs/fake/HasGenerics/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasGenerics</h5>
+    <h5>HasGenerics class</h5>
     <ol>
       <li class="section-title"><a href="fake/HasGenerics-class.html#constructors">Constructors</a></li>
       <li><a href="fake/HasGenerics/HasGenerics.html">HasGenerics</a></li>
@@ -65,6 +65,8 @@ <h5>class HasGenerics</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -79,7 +81,6 @@ <h5>class HasGenerics</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/HasGenerics/noSuchMethod.html b/testing/test_package_docs/fake/HasGenerics/noSuchMethod.html
index d7cad9d8da..2e61e05d44 100644
--- a/testing/test_package_docs/fake/HasGenerics/noSuchMethod.html
+++ b/testing/test_package_docs/fake/HasGenerics/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasGenerics</h5>
+    <h5>HasGenerics class</h5>
     <ol>
       <li class="section-title"><a href="fake/HasGenerics-class.html#constructors">Constructors</a></li>
       <li><a href="fake/HasGenerics/HasGenerics.html">HasGenerics</a></li>
@@ -65,6 +65,8 @@ <h5>class HasGenerics</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -75,7 +77,6 @@ <h5>class HasGenerics</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/HasGenerics/operator_equals.html b/testing/test_package_docs/fake/HasGenerics/operator_equals.html
index 93080b146a..d6b459921e 100644
--- a/testing/test_package_docs/fake/HasGenerics/operator_equals.html
+++ b/testing/test_package_docs/fake/HasGenerics/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasGenerics</h5>
+    <h5>HasGenerics class</h5>
     <ol>
       <li class="section-title"><a href="fake/HasGenerics-class.html#constructors">Constructors</a></li>
       <li><a href="fake/HasGenerics/HasGenerics.html">HasGenerics</a></li>
@@ -65,6 +65,8 @@ <h5>class HasGenerics</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -75,7 +77,6 @@ <h5>class HasGenerics</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/HasGenerics/returnX.html b/testing/test_package_docs/fake/HasGenerics/returnX.html
index ce7e4f2d16..117d8a5768 100644
--- a/testing/test_package_docs/fake/HasGenerics/returnX.html
+++ b/testing/test_package_docs/fake/HasGenerics/returnX.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
-    <li class="self-crumb">method returnX</li>
+    <li class="self-crumb">returnX method</li>
   </ol>
   <div class="self-name">returnX</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasGenerics</h5>
+    <h5>HasGenerics class</h5>
     <ol>
       <li class="section-title"><a href="fake/HasGenerics-class.html#constructors">Constructors</a></li>
       <li><a href="fake/HasGenerics/HasGenerics.html">HasGenerics</a></li>
@@ -65,6 +65,8 @@ <h5>class HasGenerics</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>returnX method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">X</span>
       <span class="name ">returnX</span>(<wbr>)
@@ -75,7 +77,6 @@ <h5>class HasGenerics</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method returnX</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/HasGenerics/returnZ.html b/testing/test_package_docs/fake/HasGenerics/returnZ.html
index 9da094b9b9..d2f8a87c28 100644
--- a/testing/test_package_docs/fake/HasGenerics/returnZ.html
+++ b/testing/test_package_docs/fake/HasGenerics/returnZ.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
-    <li class="self-crumb">method returnZ</li>
+    <li class="self-crumb">returnZ method</li>
   </ol>
   <div class="self-name">returnZ</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasGenerics</h5>
+    <h5>HasGenerics class</h5>
     <ol>
       <li class="section-title"><a href="fake/HasGenerics-class.html#constructors">Constructors</a></li>
       <li><a href="fake/HasGenerics/HasGenerics.html">HasGenerics</a></li>
@@ -65,6 +65,8 @@ <h5>class HasGenerics</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>returnZ method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Z</span>
       <span class="name ">returnZ</span>(<wbr>)
@@ -75,7 +77,6 @@ <h5>class HasGenerics</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method returnZ</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/HasGenerics/runtimeType.html b/testing/test_package_docs/fake/HasGenerics/runtimeType.html
index 631d84e78f..a976c69423 100644
--- a/testing/test_package_docs/fake/HasGenerics/runtimeType.html
+++ b/testing/test_package_docs/fake/HasGenerics/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasGenerics</h5>
+    <h5>HasGenerics class</h5>
     <ol>
       <li class="section-title"><a href="fake/HasGenerics-class.html#constructors">Constructors</a></li>
       <li><a href="fake/HasGenerics/HasGenerics.html">HasGenerics</a></li>
@@ -65,6 +65,8 @@ <h5>class HasGenerics</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -79,7 +81,6 @@ <h5>class HasGenerics</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/HasGenerics/toString.html b/testing/test_package_docs/fake/HasGenerics/toString.html
index 7e7f1bff7a..c58b0f0876 100644
--- a/testing/test_package_docs/fake/HasGenerics/toString.html
+++ b/testing/test_package_docs/fake/HasGenerics/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class HasGenerics</h5>
+    <h5>HasGenerics class</h5>
     <ol>
       <li class="section-title"><a href="fake/HasGenerics-class.html#constructors">Constructors</a></li>
       <li><a href="fake/HasGenerics/HasGenerics.html">HasGenerics</a></li>
@@ -65,6 +65,8 @@ <h5>class HasGenerics</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -75,7 +77,6 @@ <h5>class HasGenerics</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ImplementingThingy-class.html b/testing/test_package_docs/fake/ImplementingThingy-class.html
index 467688ca03..74a4566154 100644
--- a/testing/test_package_docs/fake/ImplementingThingy-class.html
+++ b/testing/test_package_docs/fake/ImplementingThingy-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">abstract class ImplementingThingy</li>
+    <li class="self-crumb">ImplementingThingy abstract class</li>
   </ol>
   <div class="self-name">ImplementingThingy</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ImplementingThingy class</h1>
 
     
     <section>
@@ -255,7 +256,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class ImplementingThingy</h5>
     <ol>
       <li class="section-title"><a href="fake/ImplementingThingy-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ImplementingThingy/ImplementingThingy.html">ImplementingThingy</a></li>
diff --git a/testing/test_package_docs/fake/ImplementingThingy/ImplementingThingy.html b/testing/test_package_docs/fake/ImplementingThingy/ImplementingThingy.html
index 5973d97db4..50e43a27ec 100644
--- a/testing/test_package_docs/fake/ImplementingThingy/ImplementingThingy.html
+++ b/testing/test_package_docs/fake/ImplementingThingy/ImplementingThingy.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
-    <li class="self-crumb">constructor ImplementingThingy</li>
+    <li class="self-crumb">ImplementingThingy constructor</li>
   </ol>
   <div class="self-name">ImplementingThingy</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ImplementingThingy</h5>
+    <h5>ImplementingThingy class</h5>
     <ol>
       <li class="section-title"><a href="fake/ImplementingThingy-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ImplementingThingy/ImplementingThingy.html">ImplementingThingy</a></li>
@@ -64,6 +64,8 @@ <h5>class ImplementingThingy</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ImplementingThingy constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">ImplementingThingy</span>(<wbr>)
@@ -75,7 +77,6 @@ <h5>class ImplementingThingy</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor ImplementingThingy</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ImplementingThingy2-class.html b/testing/test_package_docs/fake/ImplementingThingy2-class.html
index b2e6512b36..7cb4991179 100644
--- a/testing/test_package_docs/fake/ImplementingThingy2-class.html
+++ b/testing/test_package_docs/fake/ImplementingThingy2-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">abstract class ImplementingThingy2</li>
+    <li class="self-crumb">ImplementingThingy2 abstract class</li>
   </ol>
   <div class="self-name">ImplementingThingy2</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ImplementingThingy2 class</h1>
 
     
     <section>
@@ -252,7 +253,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class ImplementingThingy2</h5>
     <ol>
       <li class="section-title"><a href="fake/ImplementingThingy2-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ImplementingThingy2/ImplementingThingy2.html">ImplementingThingy2</a></li>
diff --git a/testing/test_package_docs/fake/ImplementingThingy2/ImplementingThingy2.html b/testing/test_package_docs/fake/ImplementingThingy2/ImplementingThingy2.html
index c76b8e0388..ff1a9c724c 100644
--- a/testing/test_package_docs/fake/ImplementingThingy2/ImplementingThingy2.html
+++ b/testing/test_package_docs/fake/ImplementingThingy2/ImplementingThingy2.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
-    <li class="self-crumb">constructor ImplementingThingy2</li>
+    <li class="self-crumb">ImplementingThingy2 constructor</li>
   </ol>
   <div class="self-name">ImplementingThingy2</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ImplementingThingy2</h5>
+    <h5>ImplementingThingy2 class</h5>
     <ol>
       <li class="section-title"><a href="fake/ImplementingThingy2-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ImplementingThingy2/ImplementingThingy2.html">ImplementingThingy2</a></li>
@@ -64,6 +64,8 @@ <h5>class ImplementingThingy2</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ImplementingThingy2 constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">ImplementingThingy2</span>(<wbr>)
@@ -75,7 +77,6 @@ <h5>class ImplementingThingy2</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor ImplementingThingy2</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ImplicitProperties-class.html b/testing/test_package_docs/fake/ImplicitProperties-class.html
index 38dfa16e1f..ad7611d3ce 100644
--- a/testing/test_package_docs/fake/ImplicitProperties-class.html
+++ b/testing/test_package_docs/fake/ImplicitProperties-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class ImplicitProperties</li>
+    <li class="self-crumb">ImplicitProperties class</li>
   </ol>
   <div class="self-name">ImplicitProperties</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ImplicitProperties class</h1>
 
     <section class="desc markdown">
       <p>Names are actually wrong in this class, but when we extend it,
@@ -268,7 +269,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class ImplicitProperties</h5>
     <ol>
       <li class="section-title"><a href="fake/ImplicitProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ImplicitProperties/ImplicitProperties.html">ImplicitProperties</a></li>
diff --git a/testing/test_package_docs/fake/ImplicitProperties/ImplicitProperties.html b/testing/test_package_docs/fake/ImplicitProperties/ImplicitProperties.html
index 2987ce4ef3..21176c689c 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/ImplicitProperties.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/ImplicitProperties.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
-    <li class="self-crumb">constructor ImplicitProperties</li>
+    <li class="self-crumb">ImplicitProperties constructor</li>
   </ol>
   <div class="self-name">ImplicitProperties</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ImplicitProperties</h5>
+    <h5>ImplicitProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ImplicitProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ImplicitProperties/ImplicitProperties.html">ImplicitProperties</a></li>
@@ -66,6 +66,8 @@ <h5>class ImplicitProperties</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ImplicitProperties constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">ImplicitProperties</span>(<wbr>)
@@ -77,7 +79,6 @@ <h5>class ImplicitProperties</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor ImplicitProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ImplicitProperties/explicitGetterImplicitSetter.html b/testing/test_package_docs/fake/ImplicitProperties/explicitGetterImplicitSetter.html
index fba65b8f83..df22e903bc 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/explicitGetterImplicitSetter.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/explicitGetterImplicitSetter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
-    <li class="self-crumb">property explicitGetterImplicitSetter</li>
+    <li class="self-crumb">explicitGetterImplicitSetter property</li>
   </ol>
   <div class="self-name">explicitGetterImplicitSetter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ImplicitProperties</h5>
+    <h5>ImplicitProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ImplicitProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ImplicitProperties/ImplicitProperties.html">ImplicitProperties</a></li>
@@ -66,6 +66,8 @@ <h5>class ImplicitProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>explicitGetterImplicitSetter property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">List<span class="signature">&lt;int&gt;</span></span>
           <span class="name ">explicitGetterImplicitSetter</span>          <div class="features">read / write</div>
@@ -78,7 +80,6 @@ <h5>class ImplicitProperties</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property explicitGetterImplicitSetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ImplicitProperties/explicitGetterSetterForInheriting.html b/testing/test_package_docs/fake/ImplicitProperties/explicitGetterSetterForInheriting.html
index 677ea43f3f..ca31e2eb28 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/explicitGetterSetterForInheriting.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/explicitGetterSetterForInheriting.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
-    <li class="self-crumb">property explicitGetterSetterForInheriting</li>
+    <li class="self-crumb">explicitGetterSetterForInheriting property</li>
   </ol>
   <div class="self-name">explicitGetterSetterForInheriting</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ImplicitProperties</h5>
+    <h5>ImplicitProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ImplicitProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ImplicitProperties/ImplicitProperties.html">ImplicitProperties</a></li>
@@ -66,6 +66,8 @@ <h5>class ImplicitProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>explicitGetterSetterForInheriting property</h1>
+
 
         <section id="getter">
         
@@ -96,7 +98,6 @@ <h5>class ImplicitProperties</h5>
           </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property explicitGetterSetterForInheriting</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ImplicitProperties/explicitPartiallyDocumentedField.html b/testing/test_package_docs/fake/ImplicitProperties/explicitPartiallyDocumentedField.html
index 53016b325d..05dadc9143 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/explicitPartiallyDocumentedField.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/explicitPartiallyDocumentedField.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
-    <li class="self-crumb">property explicitPartiallyDocumentedField</li>
+    <li class="self-crumb">explicitPartiallyDocumentedField property</li>
   </ol>
   <div class="self-name">explicitPartiallyDocumentedField</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ImplicitProperties</h5>
+    <h5>ImplicitProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ImplicitProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ImplicitProperties/ImplicitProperties.html">ImplicitProperties</a></li>
@@ -66,6 +66,8 @@ <h5>class ImplicitProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>explicitPartiallyDocumentedField property</h1>
+
 
         <section id="getter">
         
@@ -96,7 +98,6 @@ <h5>class ImplicitProperties</h5>
           </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property explicitPartiallyDocumentedField</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ImplicitProperties/forInheriting.html b/testing/test_package_docs/fake/ImplicitProperties/forInheriting.html
index bf723defa9..efc09eaae3 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/forInheriting.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/forInheriting.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
-    <li class="self-crumb">property forInheriting</li>
+    <li class="self-crumb">forInheriting property</li>
   </ol>
   <div class="self-name">forInheriting</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ImplicitProperties</h5>
+    <h5>ImplicitProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ImplicitProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ImplicitProperties/ImplicitProperties.html">ImplicitProperties</a></li>
@@ -66,6 +66,8 @@ <h5>class ImplicitProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>forInheriting property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">int</span>
           <span class="name ">forInheriting</span>          <div class="features">read / write</div>
@@ -78,7 +80,6 @@ <h5>class ImplicitProperties</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property forInheriting</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ImplicitProperties/hashCode.html b/testing/test_package_docs/fake/ImplicitProperties/hashCode.html
index cfae57c538..93823fbec7 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/hashCode.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ImplicitProperties</h5>
+    <h5>ImplicitProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ImplicitProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ImplicitProperties/ImplicitProperties.html">ImplicitProperties</a></li>
@@ -66,6 +66,8 @@ <h5>class ImplicitProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -80,7 +82,6 @@ <h5>class ImplicitProperties</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ImplicitProperties/implicitGetterExplicitSetter.html b/testing/test_package_docs/fake/ImplicitProperties/implicitGetterExplicitSetter.html
index 4c69ece05d..7086331823 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/implicitGetterExplicitSetter.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/implicitGetterExplicitSetter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
-    <li class="self-crumb">property implicitGetterExplicitSetter</li>
+    <li class="self-crumb">implicitGetterExplicitSetter property</li>
   </ol>
   <div class="self-name">implicitGetterExplicitSetter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ImplicitProperties</h5>
+    <h5>ImplicitProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ImplicitProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ImplicitProperties/ImplicitProperties.html">ImplicitProperties</a></li>
@@ -66,6 +66,8 @@ <h5>class ImplicitProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>implicitGetterExplicitSetter property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">String</span>
           <span class="name ">implicitGetterExplicitSetter</span>          <div class="features">read / write</div>
@@ -78,7 +80,6 @@ <h5>class ImplicitProperties</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property implicitGetterExplicitSetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ImplicitProperties/noSuchMethod.html b/testing/test_package_docs/fake/ImplicitProperties/noSuchMethod.html
index fba03c0df9..b41b0da553 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/noSuchMethod.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ImplicitProperties</h5>
+    <h5>ImplicitProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ImplicitProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ImplicitProperties/ImplicitProperties.html">ImplicitProperties</a></li>
@@ -66,6 +66,8 @@ <h5>class ImplicitProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -76,7 +78,6 @@ <h5>class ImplicitProperties</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ImplicitProperties/operator_equals.html b/testing/test_package_docs/fake/ImplicitProperties/operator_equals.html
index 25e3f193fa..9e52666456 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/operator_equals.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ImplicitProperties</h5>
+    <h5>ImplicitProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ImplicitProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ImplicitProperties/ImplicitProperties.html">ImplicitProperties</a></li>
@@ -66,6 +66,8 @@ <h5>class ImplicitProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -76,7 +78,6 @@ <h5>class ImplicitProperties</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ImplicitProperties/runtimeType.html b/testing/test_package_docs/fake/ImplicitProperties/runtimeType.html
index 7c7ef91e8c..4a5e7d0581 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/runtimeType.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ImplicitProperties</h5>
+    <h5>ImplicitProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ImplicitProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ImplicitProperties/ImplicitProperties.html">ImplicitProperties</a></li>
@@ -66,6 +66,8 @@ <h5>class ImplicitProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -80,7 +82,6 @@ <h5>class ImplicitProperties</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ImplicitProperties/toString.html b/testing/test_package_docs/fake/ImplicitProperties/toString.html
index 7f00990987..0a2733849a 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/toString.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ImplicitProperties</h5>
+    <h5>ImplicitProperties class</h5>
     <ol>
       <li class="section-title"><a href="fake/ImplicitProperties-class.html#constructors">Constructors</a></li>
       <li><a href="fake/ImplicitProperties/ImplicitProperties.html">ImplicitProperties</a></li>
@@ -66,6 +66,8 @@ <h5>class ImplicitProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -76,7 +78,6 @@ <h5>class ImplicitProperties</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Interface-class.html b/testing/test_package_docs/fake/Interface-class.html
index 7ca336bd01..4359743bec 100644
--- a/testing/test_package_docs/fake/Interface-class.html
+++ b/testing/test_package_docs/fake/Interface-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">abstract class Interface</li>
+    <li class="self-crumb">Interface abstract class</li>
   </ol>
   <div class="self-name">Interface</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Interface class</h1>
 
     <section class="desc markdown">
       <p>An interface that can be implemented.</p>
@@ -227,7 +228,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class Interface</h5>
     <ol>
       <li class="section-title"><a href="fake/Interface-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Interface/Interface.html">Interface</a></li>
diff --git a/testing/test_package_docs/fake/Interface/Interface.html b/testing/test_package_docs/fake/Interface/Interface.html
index 8e31238d72..ec6770fbad 100644
--- a/testing/test_package_docs/fake/Interface/Interface.html
+++ b/testing/test_package_docs/fake/Interface/Interface.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Interface-class.html">Interface</a></li>
-    <li class="self-crumb">constructor Interface</li>
+    <li class="self-crumb">Interface constructor</li>
   </ol>
   <div class="self-name">Interface</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Interface</h5>
+    <h5>Interface class</h5>
     <ol>
       <li class="section-title"><a href="fake/Interface-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Interface/Interface.html">Interface</a></li>
@@ -61,6 +61,8 @@ <h5>class Interface</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Interface constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">Interface</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class Interface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor Interface</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Interface/hashCode.html b/testing/test_package_docs/fake/Interface/hashCode.html
index df9883194a..c0014aa247 100644
--- a/testing/test_package_docs/fake/Interface/hashCode.html
+++ b/testing/test_package_docs/fake/Interface/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Interface-class.html">Interface</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Interface</h5>
+    <h5>Interface class</h5>
     <ol>
       <li class="section-title"><a href="fake/Interface-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Interface/Interface.html">Interface</a></li>
@@ -61,6 +61,8 @@ <h5>class Interface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class Interface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Interface/noSuchMethod.html b/testing/test_package_docs/fake/Interface/noSuchMethod.html
index 72991016bb..85574a9276 100644
--- a/testing/test_package_docs/fake/Interface/noSuchMethod.html
+++ b/testing/test_package_docs/fake/Interface/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Interface-class.html">Interface</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Interface</h5>
+    <h5>Interface class</h5>
     <ol>
       <li class="section-title"><a href="fake/Interface-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Interface/Interface.html">Interface</a></li>
@@ -61,6 +61,8 @@ <h5>class Interface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -71,7 +73,6 @@ <h5>class Interface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Interface/operator_equals.html b/testing/test_package_docs/fake/Interface/operator_equals.html
index 08955a6409..b7748ffd37 100644
--- a/testing/test_package_docs/fake/Interface/operator_equals.html
+++ b/testing/test_package_docs/fake/Interface/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Interface-class.html">Interface</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Interface</h5>
+    <h5>Interface class</h5>
     <ol>
       <li class="section-title"><a href="fake/Interface-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Interface/Interface.html">Interface</a></li>
@@ -61,6 +61,8 @@ <h5>class Interface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -71,7 +73,6 @@ <h5>class Interface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Interface/runtimeType.html b/testing/test_package_docs/fake/Interface/runtimeType.html
index ea044ca560..1e229a5df1 100644
--- a/testing/test_package_docs/fake/Interface/runtimeType.html
+++ b/testing/test_package_docs/fake/Interface/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Interface-class.html">Interface</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Interface</h5>
+    <h5>Interface class</h5>
     <ol>
       <li class="section-title"><a href="fake/Interface-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Interface/Interface.html">Interface</a></li>
@@ -61,6 +61,8 @@ <h5>class Interface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class Interface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Interface/toString.html b/testing/test_package_docs/fake/Interface/toString.html
index 7af415f2c4..2a2d281395 100644
--- a/testing/test_package_docs/fake/Interface/toString.html
+++ b/testing/test_package_docs/fake/Interface/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Interface-class.html">Interface</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Interface</h5>
+    <h5>Interface class</h5>
     <ol>
       <li class="section-title"><a href="fake/Interface-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Interface/Interface.html">Interface</a></li>
@@ -61,6 +61,8 @@ <h5>class Interface</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -71,7 +73,6 @@ <h5>class Interface</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/LongFirstLine-class.html b/testing/test_package_docs/fake/LongFirstLine-class.html
index d6c66fb1ba..460c741308 100644
--- a/testing/test_package_docs/fake/LongFirstLine-class.html
+++ b/testing/test_package_docs/fake/LongFirstLine-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class LongFirstLine</li>
+    <li class="self-crumb">LongFirstLine class</li>
   </ol>
   <div class="self-name">LongFirstLine</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>LongFirstLine class</h1>
 
     <section class="desc markdown">
       <p>This is a very long line spread
@@ -443,7 +444,6 @@ <h2>Constants</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class LongFirstLine</h5>
     <ol>
       <li class="section-title"><a href="fake/LongFirstLine-class.html#constructors">Constructors</a></li>
       <li><a class="deprecated" href="fake/LongFirstLine/LongFirstLine.html">LongFirstLine</a></li>
diff --git a/testing/test_package_docs/fake/LongFirstLine/ANSWER-constant.html b/testing/test_package_docs/fake/LongFirstLine/ANSWER-constant.html
index d2c74ea2f4..f58aa94b93 100644
--- a/testing/test_package_docs/fake/LongFirstLine/ANSWER-constant.html
+++ b/testing/test_package_docs/fake/LongFirstLine/ANSWER-constant.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
-    <li class="self-crumb">constant ANSWER</li>
+    <li class="self-crumb">ANSWER constant</li>
   </ol>
   <div class="self-name">ANSWER</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class LongFirstLine</h5>
+    <h5>LongFirstLine class</h5>
     <ol>
       <li class="section-title"><a href="fake/LongFirstLine-class.html#constructors">Constructors</a></li>
       <li><a class="deprecated" href="fake/LongFirstLine/LongFirstLine.html">LongFirstLine</a></li>
@@ -85,6 +85,7 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ANSWER property</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">int</span>
@@ -97,7 +98,6 @@ <h5>class LongFirstLine</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property ANSWER</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.fromHasGenerics.html b/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.fromHasGenerics.html
index 283902c703..030284f1a9 100644
--- a/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.fromHasGenerics.html
+++ b/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.fromHasGenerics.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
-    <li class="self-crumb">constructor LongFirstLine.fromHasGenerics</li>
+    <li class="self-crumb">LongFirstLine.fromHasGenerics constructor</li>
   </ol>
   <div class="self-name">LongFirstLine.fromHasGenerics</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class LongFirstLine</h5>
+    <h5>LongFirstLine class</h5>
     <ol>
       <li class="section-title"><a href="fake/LongFirstLine-class.html#constructors">Constructors</a></li>
       <li><a class="deprecated" href="fake/LongFirstLine/LongFirstLine.html">LongFirstLine</a></li>
@@ -85,6 +85,8 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>LongFirstLine.fromHasGenerics constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">LongFirstLine.fromHasGenerics</span>(<wbr><span class="parameter" id="fromHasGenerics-param-hg"><span class="type-annotation"><a href="fake/HasGenerics-class.html">HasGenerics</a></span> <span class="parameter-name">hg</span></span>)
@@ -96,7 +98,6 @@ <h5>class LongFirstLine</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor LongFirstLine.fromHasGenerics</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.fromMap.html b/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.fromMap.html
index 81c1654642..29e26565fc 100644
--- a/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.fromMap.html
+++ b/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.fromMap.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
-    <li class="self-crumb">constructor LongFirstLine.fromMap</li>
+    <li class="self-crumb">LongFirstLine.fromMap constructor</li>
   </ol>
   <div class="self-name">LongFirstLine.fromMap</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class LongFirstLine</h5>
+    <h5>LongFirstLine class</h5>
     <ol>
       <li class="section-title"><a href="fake/LongFirstLine-class.html#constructors">Constructors</a></li>
       <li><a class="deprecated" href="fake/LongFirstLine/LongFirstLine.html">LongFirstLine</a></li>
@@ -85,6 +85,8 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>LongFirstLine.fromMap constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">LongFirstLine.fromMap</span>(<wbr><span class="parameter" id="fromMap-param-data"><span class="type-annotation">Map</span> <span class="parameter-name">data</span></span>)
@@ -100,7 +102,6 @@ <h5>class LongFirstLine</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor LongFirstLine.fromMap</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.html b/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.html
index a2890a6fa3..1130c713f2 100644
--- a/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.html
+++ b/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
-    <li class="self-crumb">constructor <span class="deprecated">LongFirstLine</span></li>
+    <li class="self-crumb"><span class="deprecated">LongFirstLine</span> constructor</li>
   </ol>
   <div class="self-name">LongFirstLine</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class LongFirstLine</h5>
+    <h5>LongFirstLine class</h5>
     <ol>
       <li class="section-title"><a href="fake/LongFirstLine-class.html#constructors">Constructors</a></li>
       <li><a class="deprecated" href="fake/LongFirstLine/LongFirstLine.html">LongFirstLine</a></li>
@@ -85,6 +85,8 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>LongFirstLine constructor</h1>
+
     <section class="multi-line-signature">
       <div>
         <ol class="annotation-list">
@@ -104,7 +106,6 @@ <h5>class LongFirstLine</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/LongFirstLine/THING-constant.html b/testing/test_package_docs/fake/LongFirstLine/THING-constant.html
index 39bef9e666..14f8dea0e9 100644
--- a/testing/test_package_docs/fake/LongFirstLine/THING-constant.html
+++ b/testing/test_package_docs/fake/LongFirstLine/THING-constant.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
-    <li class="self-crumb">constant THING</li>
+    <li class="self-crumb">THING constant</li>
   </ol>
   <div class="self-name">THING</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class LongFirstLine</h5>
+    <h5>LongFirstLine class</h5>
     <ol>
       <li class="section-title"><a href="fake/LongFirstLine-class.html#constructors">Constructors</a></li>
       <li><a class="deprecated" href="fake/LongFirstLine/LongFirstLine.html">LongFirstLine</a></li>
@@ -85,6 +85,7 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>THING property</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">dynamic</span>
@@ -97,7 +98,6 @@ <h5>class LongFirstLine</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property THING</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/LongFirstLine/aStringProperty.html b/testing/test_package_docs/fake/LongFirstLine/aStringProperty.html
index 1a36ccae9a..9d46e5ee88 100644
--- a/testing/test_package_docs/fake/LongFirstLine/aStringProperty.html
+++ b/testing/test_package_docs/fake/LongFirstLine/aStringProperty.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
-    <li class="self-crumb">property aStringProperty</li>
+    <li class="self-crumb">aStringProperty property</li>
   </ol>
   <div class="self-name">aStringProperty</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class LongFirstLine</h5>
+    <h5>LongFirstLine class</h5>
     <ol>
       <li class="section-title"><a href="fake/LongFirstLine-class.html#constructors">Constructors</a></li>
       <li><a class="deprecated" href="fake/LongFirstLine/LongFirstLine.html">LongFirstLine</a></li>
@@ -85,6 +85,8 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>aStringProperty property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">String</span>
           <span class="name ">aStringProperty</span>          <div class="features">read / write</div>
@@ -97,7 +99,6 @@ <h5>class LongFirstLine</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property aStringProperty</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/LongFirstLine/dynamicGetter.html b/testing/test_package_docs/fake/LongFirstLine/dynamicGetter.html
index 4a9e42bba1..3396634c5a 100644
--- a/testing/test_package_docs/fake/LongFirstLine/dynamicGetter.html
+++ b/testing/test_package_docs/fake/LongFirstLine/dynamicGetter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
-    <li class="self-crumb">property dynamicGetter</li>
+    <li class="self-crumb">dynamicGetter property</li>
   </ol>
   <div class="self-name">dynamicGetter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class LongFirstLine</h5>
+    <h5>LongFirstLine class</h5>
     <ol>
       <li class="section-title"><a href="fake/LongFirstLine-class.html#constructors">Constructors</a></li>
       <li><a class="deprecated" href="fake/LongFirstLine/LongFirstLine.html">LongFirstLine</a></li>
@@ -85,6 +85,8 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>dynamicGetter property</h1>
+
 
         <section id="getter">
         
@@ -102,7 +104,6 @@ <h5>class LongFirstLine</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property dynamicGetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/LongFirstLine/meaningOfLife.html b/testing/test_package_docs/fake/LongFirstLine/meaningOfLife.html
index 72b13dc19c..9c71d9dcd5 100644
--- a/testing/test_package_docs/fake/LongFirstLine/meaningOfLife.html
+++ b/testing/test_package_docs/fake/LongFirstLine/meaningOfLife.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
-    <li class="self-crumb">property meaningOfLife</li>
+    <li class="self-crumb">meaningOfLife property</li>
   </ol>
   <div class="self-name">meaningOfLife</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class LongFirstLine</h5>
+    <h5>LongFirstLine class</h5>
     <ol>
       <li class="section-title"><a href="fake/LongFirstLine-class.html#constructors">Constructors</a></li>
       <li><a class="deprecated" href="fake/LongFirstLine/LongFirstLine.html">LongFirstLine</a></li>
@@ -85,6 +85,8 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>meaningOfLife property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">int</span>
           <span class="name ">meaningOfLife</span>          <div class="features">read / write</div>
@@ -97,7 +99,6 @@ <h5>class LongFirstLine</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property meaningOfLife</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/LongFirstLine/noParams.html b/testing/test_package_docs/fake/LongFirstLine/noParams.html
index a4b8225a76..92d9d2d2ba 100644
--- a/testing/test_package_docs/fake/LongFirstLine/noParams.html
+++ b/testing/test_package_docs/fake/LongFirstLine/noParams.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
-    <li class="self-crumb">method <span class="deprecated">noParams</span></li>
+    <li class="self-crumb"><span class="deprecated">noParams</span> method</li>
   </ol>
   <div class="self-name">noParams</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class LongFirstLine</h5>
+    <h5>LongFirstLine class</h5>
     <ol>
       <li class="section-title"><a href="fake/LongFirstLine-class.html#constructors">Constructors</a></li>
       <li><a class="deprecated" href="fake/LongFirstLine/LongFirstLine.html">LongFirstLine</a></li>
@@ -85,6 +85,8 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noParams method</h1>
+
     <section class="multi-line-signature">
       <div>
         <ol class="annotation-list">
@@ -103,7 +105,6 @@ <h5>class LongFirstLine</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noParams</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/LongFirstLine/onlySetter.html b/testing/test_package_docs/fake/LongFirstLine/onlySetter.html
index 007c459702..8b411e478f 100644
--- a/testing/test_package_docs/fake/LongFirstLine/onlySetter.html
+++ b/testing/test_package_docs/fake/LongFirstLine/onlySetter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
-    <li class="self-crumb">property onlySetter</li>
+    <li class="self-crumb">onlySetter property</li>
   </ol>
   <div class="self-name">onlySetter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class LongFirstLine</h5>
+    <h5>LongFirstLine class</h5>
     <ol>
       <li class="section-title"><a href="fake/LongFirstLine-class.html#constructors">Constructors</a></li>
       <li><a class="deprecated" href="fake/LongFirstLine/LongFirstLine.html">LongFirstLine</a></li>
@@ -85,6 +85,8 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>onlySetter property</h1>
+
 
 
         <section id="setter">
@@ -103,7 +105,6 @@ <h5>class LongFirstLine</h5>
           </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property onlySetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/LongFirstLine/operator_multiply.html b/testing/test_package_docs/fake/LongFirstLine/operator_multiply.html
index 4bfd74bcbf..435101336f 100644
--- a/testing/test_package_docs/fake/LongFirstLine/operator_multiply.html
+++ b/testing/test_package_docs/fake/LongFirstLine/operator_multiply.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
-    <li class="self-crumb">method operator *</li>
+    <li class="self-crumb">operator * method</li>
   </ol>
   <div class="self-name">operator *</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class LongFirstLine</h5>
+    <h5>LongFirstLine class</h5>
     <ol>
       <li class="section-title"><a href="fake/LongFirstLine-class.html#constructors">Constructors</a></li>
       <li><a class="deprecated" href="fake/LongFirstLine/LongFirstLine.html">LongFirstLine</a></li>
@@ -85,6 +85,8 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator * method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype"><a href="fake/LongFirstLine-class.html">LongFirstLine</a></span>
       <span class="name ">operator *</span>(<wbr><span class="parameter" id="*-param-other"><span class="type-annotation"><a href="fake/LongFirstLine-class.html">LongFirstLine</a></span> <span class="parameter-name">other</span></span>)
@@ -98,7 +100,6 @@ <h5>class LongFirstLine</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator *</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/LongFirstLine/operator_plus.html b/testing/test_package_docs/fake/LongFirstLine/operator_plus.html
index ce1657cb39..79654d2d59 100644
--- a/testing/test_package_docs/fake/LongFirstLine/operator_plus.html
+++ b/testing/test_package_docs/fake/LongFirstLine/operator_plus.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
-    <li class="self-crumb">method operator +</li>
+    <li class="self-crumb">operator + method</li>
   </ol>
   <div class="self-name">operator +</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class LongFirstLine</h5>
+    <h5>LongFirstLine class</h5>
     <ol>
       <li class="section-title"><a href="fake/LongFirstLine-class.html#constructors">Constructors</a></li>
       <li><a class="deprecated" href="fake/LongFirstLine/LongFirstLine.html">LongFirstLine</a></li>
@@ -85,6 +85,8 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator + method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype"><a href="fake/LongFirstLine-class.html">LongFirstLine</a></span>
       <span class="name ">operator +</span>(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation"><a href="fake/LongFirstLine-class.html">LongFirstLine</a></span> <span class="parameter-name">other</span></span>)
@@ -98,7 +100,6 @@ <h5>class LongFirstLine</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator +</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/LongFirstLine/optionalParams.html b/testing/test_package_docs/fake/LongFirstLine/optionalParams.html
index 813335d3e1..dc6041ab8b 100644
--- a/testing/test_package_docs/fake/LongFirstLine/optionalParams.html
+++ b/testing/test_package_docs/fake/LongFirstLine/optionalParams.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
-    <li class="self-crumb">method optionalParams</li>
+    <li class="self-crumb">optionalParams method</li>
   </ol>
   <div class="self-name">optionalParams</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class LongFirstLine</h5>
+    <h5>LongFirstLine class</h5>
     <ol>
       <li class="section-title"><a href="fake/LongFirstLine-class.html#constructors">Constructors</a></li>
       <li><a class="deprecated" href="fake/LongFirstLine/LongFirstLine.html">LongFirstLine</a></li>
@@ -85,6 +85,8 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>optionalParams method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">optionalParams</span>(<wbr><span class="parameter" id="optionalParams-param-first"><span class="parameter-name">first</span>, {</span> <span class="parameter" id="optionalParams-param-second"><span class="parameter-name">second</span>, </span> <span class="parameter" id="optionalParams-param-third"><span class="type-annotation">int</span> <span class="parameter-name">third</span></span> })
@@ -98,7 +100,6 @@ <h5>class LongFirstLine</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method optionalParams</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/LongFirstLine/returnString.html b/testing/test_package_docs/fake/LongFirstLine/returnString.html
index 6294157163..806f7ca270 100644
--- a/testing/test_package_docs/fake/LongFirstLine/returnString.html
+++ b/testing/test_package_docs/fake/LongFirstLine/returnString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
-    <li class="self-crumb">method returnString</li>
+    <li class="self-crumb">returnString method</li>
   </ol>
   <div class="self-name">returnString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class LongFirstLine</h5>
+    <h5>LongFirstLine class</h5>
     <ol>
       <li class="section-title"><a href="fake/LongFirstLine-class.html#constructors">Constructors</a></li>
       <li><a class="deprecated" href="fake/LongFirstLine/LongFirstLine.html">LongFirstLine</a></li>
@@ -85,6 +85,8 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>returnString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">returnString</span>(<wbr>)
@@ -98,7 +100,6 @@ <h5>class LongFirstLine</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method returnString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/LongFirstLine/staticGetter.html b/testing/test_package_docs/fake/LongFirstLine/staticGetter.html
index dd55c6094b..ad962b312d 100644
--- a/testing/test_package_docs/fake/LongFirstLine/staticGetter.html
+++ b/testing/test_package_docs/fake/LongFirstLine/staticGetter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
-    <li class="self-crumb">property staticGetter</li>
+    <li class="self-crumb">staticGetter property</li>
   </ol>
   <div class="self-name">staticGetter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class LongFirstLine</h5>
+    <h5>LongFirstLine class</h5>
     <ol>
       <li class="section-title"><a href="fake/LongFirstLine-class.html#constructors">Constructors</a></li>
       <li><a class="deprecated" href="fake/LongFirstLine/LongFirstLine.html">LongFirstLine</a></li>
@@ -85,6 +85,8 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>staticGetter property</h1>
+
 
         <section id="getter">
         
@@ -99,7 +101,6 @@ <h5>class LongFirstLine</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property staticGetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/LongFirstLine/staticMethodNoParams.html b/testing/test_package_docs/fake/LongFirstLine/staticMethodNoParams.html
index 1a17202299..0561d449dc 100644
--- a/testing/test_package_docs/fake/LongFirstLine/staticMethodNoParams.html
+++ b/testing/test_package_docs/fake/LongFirstLine/staticMethodNoParams.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
-    <li class="self-crumb">method staticMethodNoParams</li>
+    <li class="self-crumb">staticMethodNoParams method</li>
   </ol>
   <div class="self-name">staticMethodNoParams</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class LongFirstLine</h5>
+    <h5>LongFirstLine class</h5>
     <ol>
       <li class="section-title"><a href="fake/LongFirstLine-class.html#constructors">Constructors</a></li>
       <li><a class="deprecated" href="fake/LongFirstLine/LongFirstLine.html">LongFirstLine</a></li>
@@ -85,6 +85,8 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>staticMethodNoParams method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">int</span>
       <span class="name ">staticMethodNoParams</span>(<wbr>)
@@ -99,7 +101,6 @@ <h5>class LongFirstLine</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method staticMethodNoParams</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/LongFirstLine/staticMethodReturnsVoid.html b/testing/test_package_docs/fake/LongFirstLine/staticMethodReturnsVoid.html
index 76d72242ea..8d3df7125b 100644
--- a/testing/test_package_docs/fake/LongFirstLine/staticMethodReturnsVoid.html
+++ b/testing/test_package_docs/fake/LongFirstLine/staticMethodReturnsVoid.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
-    <li class="self-crumb">method staticMethodReturnsVoid</li>
+    <li class="self-crumb">staticMethodReturnsVoid method</li>
   </ol>
   <div class="self-name">staticMethodReturnsVoid</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class LongFirstLine</h5>
+    <h5>LongFirstLine class</h5>
     <ol>
       <li class="section-title"><a href="fake/LongFirstLine-class.html#constructors">Constructors</a></li>
       <li><a class="deprecated" href="fake/LongFirstLine/LongFirstLine.html">LongFirstLine</a></li>
@@ -85,6 +85,8 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>staticMethodReturnsVoid method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">staticMethodReturnsVoid</span>(<wbr><span class="parameter" id="staticMethodReturnsVoid-param-dynamicThing"><span class="parameter-name">dynamicThing</span></span>)
@@ -98,7 +100,6 @@ <h5>class LongFirstLine</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method staticMethodReturnsVoid</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/LongFirstLine/staticOnlySetter.html b/testing/test_package_docs/fake/LongFirstLine/staticOnlySetter.html
index af870a484d..36082ab648 100644
--- a/testing/test_package_docs/fake/LongFirstLine/staticOnlySetter.html
+++ b/testing/test_package_docs/fake/LongFirstLine/staticOnlySetter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
-    <li class="self-crumb">property staticOnlySetter</li>
+    <li class="self-crumb">staticOnlySetter property</li>
   </ol>
   <div class="self-name">staticOnlySetter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class LongFirstLine</h5>
+    <h5>LongFirstLine class</h5>
     <ol>
       <li class="section-title"><a href="fake/LongFirstLine-class.html#constructors">Constructors</a></li>
       <li><a class="deprecated" href="fake/LongFirstLine/LongFirstLine.html">LongFirstLine</a></li>
@@ -85,6 +85,8 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>staticOnlySetter property</h1>
+
 
 
         <section id="setter">
@@ -100,7 +102,6 @@ <h5>class LongFirstLine</h5>
           </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property staticOnlySetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/LongFirstLine/twoParams.html b/testing/test_package_docs/fake/LongFirstLine/twoParams.html
index 2f06a220ca..6e9387e12c 100644
--- a/testing/test_package_docs/fake/LongFirstLine/twoParams.html
+++ b/testing/test_package_docs/fake/LongFirstLine/twoParams.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
-    <li class="self-crumb">method twoParams</li>
+    <li class="self-crumb">twoParams method</li>
   </ol>
   <div class="self-name">twoParams</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class LongFirstLine</h5>
+    <h5>LongFirstLine class</h5>
     <ol>
       <li class="section-title"><a href="fake/LongFirstLine-class.html#constructors">Constructors</a></li>
       <li><a class="deprecated" href="fake/LongFirstLine/LongFirstLine.html">LongFirstLine</a></li>
@@ -85,6 +85,8 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>twoParams method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">int</span>
       <span class="name ">twoParams</span>(<wbr><span class="parameter" id="twoParams-param-one"><span class="type-annotation">String</span> <span class="parameter-name">one</span>, </span> <span class="parameter" id="twoParams-param-two"><span class="parameter-name">two</span></span>)
@@ -98,7 +100,6 @@ <h5>class LongFirstLine</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method twoParams</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/LotsAndLotsOfParameters.html b/testing/test_package_docs/fake/LotsAndLotsOfParameters.html
index 30e08ac5b8..f0b9d28bf5 100644
--- a/testing/test_package_docs/fake/LotsAndLotsOfParameters.html
+++ b/testing/test_package_docs/fake/LotsAndLotsOfParameters.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">typedef LotsAndLotsOfParameters</li>
+    <li class="self-crumb">LotsAndLotsOfParameters typedef</li>
   </ol>
   <div class="self-name">LotsAndLotsOfParameters</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>LotsAndLotsOfParameters typedef</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">int</span>
@@ -142,7 +143,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>typedef LotsAndLotsOfParameters</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/MixMeIn-class.html b/testing/test_package_docs/fake/MixMeIn-class.html
index 4d6e224e18..f54abdba6c 100644
--- a/testing/test_package_docs/fake/MixMeIn-class.html
+++ b/testing/test_package_docs/fake/MixMeIn-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">abstract class MixMeIn</li>
+    <li class="self-crumb">MixMeIn abstract class</li>
   </ol>
   <div class="self-name">MixMeIn</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>MixMeIn class</h1>
 
     <section class="desc markdown">
       <p>Perfect for mix-ins.</p>
@@ -227,7 +228,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class MixMeIn</h5>
     <ol>
       <li class="section-title"><a href="fake/MixMeIn-class.html#constructors">Constructors</a></li>
       <li><a href="fake/MixMeIn/MixMeIn.html">MixMeIn</a></li>
diff --git a/testing/test_package_docs/fake/MixMeIn/MixMeIn.html b/testing/test_package_docs/fake/MixMeIn/MixMeIn.html
index 1246567855..f674a97088 100644
--- a/testing/test_package_docs/fake/MixMeIn/MixMeIn.html
+++ b/testing/test_package_docs/fake/MixMeIn/MixMeIn.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
-    <li class="self-crumb">constructor MixMeIn</li>
+    <li class="self-crumb">MixMeIn constructor</li>
   </ol>
   <div class="self-name">MixMeIn</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MixMeIn</h5>
+    <h5>MixMeIn class</h5>
     <ol>
       <li class="section-title"><a href="fake/MixMeIn-class.html#constructors">Constructors</a></li>
       <li><a href="fake/MixMeIn/MixMeIn.html">MixMeIn</a></li>
@@ -61,6 +61,8 @@ <h5>class MixMeIn</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>MixMeIn constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">MixMeIn</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class MixMeIn</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor MixMeIn</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/MixMeIn/hashCode.html b/testing/test_package_docs/fake/MixMeIn/hashCode.html
index ec37863248..aee9298660 100644
--- a/testing/test_package_docs/fake/MixMeIn/hashCode.html
+++ b/testing/test_package_docs/fake/MixMeIn/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MixMeIn</h5>
+    <h5>MixMeIn class</h5>
     <ol>
       <li class="section-title"><a href="fake/MixMeIn-class.html#constructors">Constructors</a></li>
       <li><a href="fake/MixMeIn/MixMeIn.html">MixMeIn</a></li>
@@ -61,6 +61,8 @@ <h5>class MixMeIn</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class MixMeIn</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/MixMeIn/noSuchMethod.html b/testing/test_package_docs/fake/MixMeIn/noSuchMethod.html
index 055d8b6c7a..9bdd0fed9f 100644
--- a/testing/test_package_docs/fake/MixMeIn/noSuchMethod.html
+++ b/testing/test_package_docs/fake/MixMeIn/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MixMeIn</h5>
+    <h5>MixMeIn class</h5>
     <ol>
       <li class="section-title"><a href="fake/MixMeIn-class.html#constructors">Constructors</a></li>
       <li><a href="fake/MixMeIn/MixMeIn.html">MixMeIn</a></li>
@@ -61,6 +61,8 @@ <h5>class MixMeIn</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -71,7 +73,6 @@ <h5>class MixMeIn</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/MixMeIn/operator_equals.html b/testing/test_package_docs/fake/MixMeIn/operator_equals.html
index a404c5f59b..cae52b2124 100644
--- a/testing/test_package_docs/fake/MixMeIn/operator_equals.html
+++ b/testing/test_package_docs/fake/MixMeIn/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MixMeIn</h5>
+    <h5>MixMeIn class</h5>
     <ol>
       <li class="section-title"><a href="fake/MixMeIn-class.html#constructors">Constructors</a></li>
       <li><a href="fake/MixMeIn/MixMeIn.html">MixMeIn</a></li>
@@ -61,6 +61,8 @@ <h5>class MixMeIn</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -71,7 +73,6 @@ <h5>class MixMeIn</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/MixMeIn/runtimeType.html b/testing/test_package_docs/fake/MixMeIn/runtimeType.html
index 5b0d85b74d..982cd60a49 100644
--- a/testing/test_package_docs/fake/MixMeIn/runtimeType.html
+++ b/testing/test_package_docs/fake/MixMeIn/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MixMeIn</h5>
+    <h5>MixMeIn class</h5>
     <ol>
       <li class="section-title"><a href="fake/MixMeIn-class.html#constructors">Constructors</a></li>
       <li><a href="fake/MixMeIn/MixMeIn.html">MixMeIn</a></li>
@@ -61,6 +61,8 @@ <h5>class MixMeIn</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class MixMeIn</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/MixMeIn/toString.html b/testing/test_package_docs/fake/MixMeIn/toString.html
index b1879f0941..d82667e783 100644
--- a/testing/test_package_docs/fake/MixMeIn/toString.html
+++ b/testing/test_package_docs/fake/MixMeIn/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class MixMeIn</h5>
+    <h5>MixMeIn class</h5>
     <ol>
       <li class="section-title"><a href="fake/MixMeIn-class.html#constructors">Constructors</a></li>
       <li><a href="fake/MixMeIn/MixMeIn.html">MixMeIn</a></li>
@@ -61,6 +61,8 @@ <h5>class MixMeIn</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -71,7 +73,6 @@ <h5>class MixMeIn</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html b/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html
index 28150574d2..18e66f9b2d 100644
--- a/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html
+++ b/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">constant NAME_SINGLEUNDERSCORE</li>
+    <li class="self-crumb">NAME_SINGLEUNDERSCORE constant</li>
   </ol>
   <div class="self-name">NAME_SINGLEUNDERSCORE</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>NAME_SINGLEUNDERSCORE top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name ">NAME_SINGLEUNDERSCORE</span>      =
@@ -140,7 +141,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property NAME_SINGLEUNDERSCORE</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html b/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
index 5bbec1112b..a2dfc0d86b 100644
--- a/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
+++ b/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">constant NAME_WITH_TWO_UNDERSCORES</li>
+    <li class="self-crumb">NAME_WITH_TWO_UNDERSCORES constant</li>
   </ol>
   <div class="self-name">NAME_WITH_TWO_UNDERSCORES</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>NAME_WITH_TWO_UNDERSCORES top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name ">NAME_WITH_TWO_UNDERSCORES</span>      =
@@ -140,7 +141,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property NAME_WITH_TWO_UNDERSCORES</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/NewGenericTypedef.html b/testing/test_package_docs/fake/NewGenericTypedef.html
index 0ad2984cd7..3138fc1418 100644
--- a/testing/test_package_docs/fake/NewGenericTypedef.html
+++ b/testing/test_package_docs/fake/NewGenericTypedef.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">typedef NewGenericTypedef&lt;T&gt;</li>
+    <li class="self-crumb">NewGenericTypedef&lt;T&gt; typedef</li>
   </ol>
   <div class="self-name">NewGenericTypedef</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>NewGenericTypedef&lt;T&gt; typedef</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">List<span class="signature">&lt;S&gt;</span></span>
@@ -142,7 +143,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>typedef NewGenericTypedef</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/NotAMixin-class.html b/testing/test_package_docs/fake/NotAMixin-class.html
index 44f7227f5c..39e8c2cf8d 100644
--- a/testing/test_package_docs/fake/NotAMixin-class.html
+++ b/testing/test_package_docs/fake/NotAMixin-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class NotAMixin</li>
+    <li class="self-crumb">NotAMixin class</li>
   </ol>
   <div class="self-name">NotAMixin</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>NotAMixin class</h1>
 
     
     <section>
@@ -232,7 +233,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class NotAMixin</h5>
     <ol>
       <li class="section-title"><a href="fake/NotAMixin-class.html#constructors">Constructors</a></li>
       <li><a href="fake/NotAMixin/NotAMixin.html">NotAMixin</a></li>
diff --git a/testing/test_package_docs/fake/NotAMixin/NotAMixin.html b/testing/test_package_docs/fake/NotAMixin/NotAMixin.html
index 2403781a1e..84577fec02 100644
--- a/testing/test_package_docs/fake/NotAMixin/NotAMixin.html
+++ b/testing/test_package_docs/fake/NotAMixin/NotAMixin.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
-    <li class="self-crumb">constructor NotAMixin</li>
+    <li class="self-crumb">NotAMixin constructor</li>
   </ol>
   <div class="self-name">NotAMixin</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class NotAMixin</h5>
+    <h5>NotAMixin class</h5>
     <ol>
       <li class="section-title"><a href="fake/NotAMixin-class.html#constructors">Constructors</a></li>
       <li><a href="fake/NotAMixin/NotAMixin.html">NotAMixin</a></li>
@@ -62,6 +62,8 @@ <h5>class NotAMixin</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>NotAMixin constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">NotAMixin</span>(<wbr>)
@@ -73,7 +75,6 @@ <h5>class NotAMixin</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor NotAMixin</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/NotAMixin/hashCode.html b/testing/test_package_docs/fake/NotAMixin/hashCode.html
index b1342275d4..f35de620fd 100644
--- a/testing/test_package_docs/fake/NotAMixin/hashCode.html
+++ b/testing/test_package_docs/fake/NotAMixin/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class NotAMixin</h5>
+    <h5>NotAMixin class</h5>
     <ol>
       <li class="section-title"><a href="fake/NotAMixin-class.html#constructors">Constructors</a></li>
       <li><a href="fake/NotAMixin/NotAMixin.html">NotAMixin</a></li>
@@ -62,6 +62,8 @@ <h5>class NotAMixin</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class NotAMixin</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/NotAMixin/noSuchMethod.html b/testing/test_package_docs/fake/NotAMixin/noSuchMethod.html
index a8c5dacf02..64d5d9d044 100644
--- a/testing/test_package_docs/fake/NotAMixin/noSuchMethod.html
+++ b/testing/test_package_docs/fake/NotAMixin/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class NotAMixin</h5>
+    <h5>NotAMixin class</h5>
     <ol>
       <li class="section-title"><a href="fake/NotAMixin-class.html#constructors">Constructors</a></li>
       <li><a href="fake/NotAMixin/NotAMixin.html">NotAMixin</a></li>
@@ -62,6 +62,8 @@ <h5>class NotAMixin</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -72,7 +74,6 @@ <h5>class NotAMixin</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/NotAMixin/operator_equals.html b/testing/test_package_docs/fake/NotAMixin/operator_equals.html
index f4cec47c4f..39f082ff77 100644
--- a/testing/test_package_docs/fake/NotAMixin/operator_equals.html
+++ b/testing/test_package_docs/fake/NotAMixin/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class NotAMixin</h5>
+    <h5>NotAMixin class</h5>
     <ol>
       <li class="section-title"><a href="fake/NotAMixin-class.html#constructors">Constructors</a></li>
       <li><a href="fake/NotAMixin/NotAMixin.html">NotAMixin</a></li>
@@ -62,6 +62,8 @@ <h5>class NotAMixin</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -72,7 +74,6 @@ <h5>class NotAMixin</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/NotAMixin/runtimeType.html b/testing/test_package_docs/fake/NotAMixin/runtimeType.html
index da13851626..00cc9c651d 100644
--- a/testing/test_package_docs/fake/NotAMixin/runtimeType.html
+++ b/testing/test_package_docs/fake/NotAMixin/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class NotAMixin</h5>
+    <h5>NotAMixin class</h5>
     <ol>
       <li class="section-title"><a href="fake/NotAMixin-class.html#constructors">Constructors</a></li>
       <li><a href="fake/NotAMixin/NotAMixin.html">NotAMixin</a></li>
@@ -62,6 +62,8 @@ <h5>class NotAMixin</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class NotAMixin</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/NotAMixin/superString.html b/testing/test_package_docs/fake/NotAMixin/superString.html
index dbfd9479e3..7e6f97ed53 100644
--- a/testing/test_package_docs/fake/NotAMixin/superString.html
+++ b/testing/test_package_docs/fake/NotAMixin/superString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
-    <li class="self-crumb">property superString</li>
+    <li class="self-crumb">superString property</li>
   </ol>
   <div class="self-name">superString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class NotAMixin</h5>
+    <h5>NotAMixin class</h5>
     <ol>
       <li class="section-title"><a href="fake/NotAMixin-class.html#constructors">Constructors</a></li>
       <li><a href="fake/NotAMixin/NotAMixin.html">NotAMixin</a></li>
@@ -62,6 +62,8 @@ <h5>class NotAMixin</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>superString property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class NotAMixin</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property superString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/NotAMixin/toString.html b/testing/test_package_docs/fake/NotAMixin/toString.html
index 5e89b38b15..0df6823b0e 100644
--- a/testing/test_package_docs/fake/NotAMixin/toString.html
+++ b/testing/test_package_docs/fake/NotAMixin/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class NotAMixin</h5>
+    <h5>NotAMixin class</h5>
     <ol>
       <li class="section-title"><a href="fake/NotAMixin-class.html#constructors">Constructors</a></li>
       <li><a href="fake/NotAMixin/NotAMixin.html">NotAMixin</a></li>
@@ -62,6 +62,8 @@ <h5>class NotAMixin</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class NotAMixin</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Oops-class.html b/testing/test_package_docs/fake/Oops-class.html
index fcde8049d6..032e1804d1 100644
--- a/testing/test_package_docs/fake/Oops-class.html
+++ b/testing/test_package_docs/fake/Oops-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class Oops</li>
+    <li class="self-crumb">Oops class</li>
   </ol>
   <div class="self-name">Oops</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Oops class</h1>
 
     <section class="desc markdown">
       <p>My bad!</p>
@@ -237,7 +238,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class Oops</h5>
     <ol>
       <li class="section-title"><a href="fake/Oops-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Oops/Oops.html">Oops</a></li>
diff --git a/testing/test_package_docs/fake/Oops/Oops.html b/testing/test_package_docs/fake/Oops/Oops.html
index 04e37ef177..e54e0dfd55 100644
--- a/testing/test_package_docs/fake/Oops/Oops.html
+++ b/testing/test_package_docs/fake/Oops/Oops.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Oops-class.html">Oops</a></li>
-    <li class="self-crumb">constructor Oops</li>
+    <li class="self-crumb">Oops constructor</li>
   </ol>
   <div class="self-name">Oops</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Oops</h5>
+    <h5>Oops class</h5>
     <ol>
       <li class="section-title"><a href="fake/Oops-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Oops/Oops.html">Oops</a></li>
@@ -62,6 +62,8 @@ <h5>class Oops</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Oops constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">Oops</span>(<wbr><span class="parameter" id="-param-message"><span class="type-annotation">String</span> <span class="parameter-name">message</span></span>)
@@ -73,7 +75,6 @@ <h5>class Oops</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor Oops</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Oops/hashCode.html b/testing/test_package_docs/fake/Oops/hashCode.html
index a9594fd9f5..64969bcf30 100644
--- a/testing/test_package_docs/fake/Oops/hashCode.html
+++ b/testing/test_package_docs/fake/Oops/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Oops-class.html">Oops</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Oops</h5>
+    <h5>Oops class</h5>
     <ol>
       <li class="section-title"><a href="fake/Oops-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Oops/Oops.html">Oops</a></li>
@@ -62,6 +62,8 @@ <h5>class Oops</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class Oops</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Oops/message.html b/testing/test_package_docs/fake/Oops/message.html
index 9020e56907..2e08b8abc6 100644
--- a/testing/test_package_docs/fake/Oops/message.html
+++ b/testing/test_package_docs/fake/Oops/message.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Oops-class.html">Oops</a></li>
-    <li class="self-crumb">property message</li>
+    <li class="self-crumb">message property</li>
   </ol>
   <div class="self-name">message</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Oops</h5>
+    <h5>Oops class</h5>
     <ol>
       <li class="section-title"><a href="fake/Oops-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Oops/Oops.html">Oops</a></li>
@@ -62,6 +62,8 @@ <h5>class Oops</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>message property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">String</span>
           <span class="name ">message</span>          <div class="features">final</div>
@@ -71,7 +73,6 @@ <h5>class Oops</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property message</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Oops/noSuchMethod.html b/testing/test_package_docs/fake/Oops/noSuchMethod.html
index ef66dc9b0d..116cd244ac 100644
--- a/testing/test_package_docs/fake/Oops/noSuchMethod.html
+++ b/testing/test_package_docs/fake/Oops/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Oops-class.html">Oops</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Oops</h5>
+    <h5>Oops class</h5>
     <ol>
       <li class="section-title"><a href="fake/Oops-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Oops/Oops.html">Oops</a></li>
@@ -62,6 +62,8 @@ <h5>class Oops</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -72,7 +74,6 @@ <h5>class Oops</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Oops/operator_equals.html b/testing/test_package_docs/fake/Oops/operator_equals.html
index 65a3b9d468..f9a69e0c85 100644
--- a/testing/test_package_docs/fake/Oops/operator_equals.html
+++ b/testing/test_package_docs/fake/Oops/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Oops-class.html">Oops</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Oops</h5>
+    <h5>Oops class</h5>
     <ol>
       <li class="section-title"><a href="fake/Oops-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Oops/Oops.html">Oops</a></li>
@@ -62,6 +62,8 @@ <h5>class Oops</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -72,7 +74,6 @@ <h5>class Oops</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Oops/runtimeType.html b/testing/test_package_docs/fake/Oops/runtimeType.html
index 276aa7b2bf..df854e8ce7 100644
--- a/testing/test_package_docs/fake/Oops/runtimeType.html
+++ b/testing/test_package_docs/fake/Oops/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Oops-class.html">Oops</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Oops</h5>
+    <h5>Oops class</h5>
     <ol>
       <li class="section-title"><a href="fake/Oops-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Oops/Oops.html">Oops</a></li>
@@ -62,6 +62,8 @@ <h5>class Oops</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class Oops</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/Oops/toString.html b/testing/test_package_docs/fake/Oops/toString.html
index 424886a821..043ec6443a 100644
--- a/testing/test_package_docs/fake/Oops/toString.html
+++ b/testing/test_package_docs/fake/Oops/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/Oops-class.html">Oops</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Oops</h5>
+    <h5>Oops class</h5>
     <ol>
       <li class="section-title"><a href="fake/Oops-class.html#constructors">Constructors</a></li>
       <li><a href="fake/Oops/Oops.html">Oops</a></li>
@@ -62,6 +62,8 @@ <h5>class Oops</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class Oops</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/OperatorReferenceClass-class.html b/testing/test_package_docs/fake/OperatorReferenceClass-class.html
index ab6ed53ad9..d7ab433b97 100644
--- a/testing/test_package_docs/fake/OperatorReferenceClass-class.html
+++ b/testing/test_package_docs/fake/OperatorReferenceClass-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class OperatorReferenceClass</li>
+    <li class="self-crumb">OperatorReferenceClass class</li>
   </ol>
   <div class="self-name">OperatorReferenceClass</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>OperatorReferenceClass class</h1>
 
     <section class="desc markdown">
       <p>Test operator references: <a href="fake/OperatorReferenceClass/operator_equals.html">OperatorReferenceClass.==</a>.</p>
@@ -215,7 +216,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class OperatorReferenceClass</h5>
     <ol>
       <li class="section-title"><a href="fake/OperatorReferenceClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/OperatorReferenceClass/OperatorReferenceClass.html">OperatorReferenceClass</a></li>
diff --git a/testing/test_package_docs/fake/OperatorReferenceClass/OperatorReferenceClass.html b/testing/test_package_docs/fake/OperatorReferenceClass/OperatorReferenceClass.html
index f3e16d0563..fd6a103652 100644
--- a/testing/test_package_docs/fake/OperatorReferenceClass/OperatorReferenceClass.html
+++ b/testing/test_package_docs/fake/OperatorReferenceClass/OperatorReferenceClass.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
-    <li class="self-crumb">constructor OperatorReferenceClass</li>
+    <li class="self-crumb">OperatorReferenceClass constructor</li>
   </ol>
   <div class="self-name">OperatorReferenceClass</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class OperatorReferenceClass</h5>
+    <h5>OperatorReferenceClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/OperatorReferenceClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/OperatorReferenceClass/OperatorReferenceClass.html">OperatorReferenceClass</a></li>
@@ -61,6 +61,8 @@ <h5>class OperatorReferenceClass</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>OperatorReferenceClass constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">OperatorReferenceClass</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class OperatorReferenceClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor OperatorReferenceClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/OperatorReferenceClass/hashCode.html b/testing/test_package_docs/fake/OperatorReferenceClass/hashCode.html
index 76f4b5e426..4dee47eb19 100644
--- a/testing/test_package_docs/fake/OperatorReferenceClass/hashCode.html
+++ b/testing/test_package_docs/fake/OperatorReferenceClass/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class OperatorReferenceClass</h5>
+    <h5>OperatorReferenceClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/OperatorReferenceClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/OperatorReferenceClass/OperatorReferenceClass.html">OperatorReferenceClass</a></li>
@@ -61,6 +61,8 @@ <h5>class OperatorReferenceClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class OperatorReferenceClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/OperatorReferenceClass/noSuchMethod.html b/testing/test_package_docs/fake/OperatorReferenceClass/noSuchMethod.html
index a6394cd578..5f0f440585 100644
--- a/testing/test_package_docs/fake/OperatorReferenceClass/noSuchMethod.html
+++ b/testing/test_package_docs/fake/OperatorReferenceClass/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class OperatorReferenceClass</h5>
+    <h5>OperatorReferenceClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/OperatorReferenceClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/OperatorReferenceClass/OperatorReferenceClass.html">OperatorReferenceClass</a></li>
@@ -61,6 +61,8 @@ <h5>class OperatorReferenceClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -71,7 +73,6 @@ <h5>class OperatorReferenceClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/OperatorReferenceClass/operator_equals.html b/testing/test_package_docs/fake/OperatorReferenceClass/operator_equals.html
index 7da9dfd215..90b4f2ba0c 100644
--- a/testing/test_package_docs/fake/OperatorReferenceClass/operator_equals.html
+++ b/testing/test_package_docs/fake/OperatorReferenceClass/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class OperatorReferenceClass</h5>
+    <h5>OperatorReferenceClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/OperatorReferenceClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/OperatorReferenceClass/OperatorReferenceClass.html">OperatorReferenceClass</a></li>
@@ -61,6 +61,8 @@ <h5>class OperatorReferenceClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <div>
         <ol class="annotation-list">
@@ -76,7 +78,6 @@ <h5>class OperatorReferenceClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/OperatorReferenceClass/runtimeType.html b/testing/test_package_docs/fake/OperatorReferenceClass/runtimeType.html
index 04642bc9e7..9d5d245b88 100644
--- a/testing/test_package_docs/fake/OperatorReferenceClass/runtimeType.html
+++ b/testing/test_package_docs/fake/OperatorReferenceClass/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class OperatorReferenceClass</h5>
+    <h5>OperatorReferenceClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/OperatorReferenceClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/OperatorReferenceClass/OperatorReferenceClass.html">OperatorReferenceClass</a></li>
@@ -61,6 +61,8 @@ <h5>class OperatorReferenceClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class OperatorReferenceClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/OperatorReferenceClass/toString.html b/testing/test_package_docs/fake/OperatorReferenceClass/toString.html
index 2541c6698e..4ecfc92a29 100644
--- a/testing/test_package_docs/fake/OperatorReferenceClass/toString.html
+++ b/testing/test_package_docs/fake/OperatorReferenceClass/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class OperatorReferenceClass</h5>
+    <h5>OperatorReferenceClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/OperatorReferenceClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/OperatorReferenceClass/OperatorReferenceClass.html">OperatorReferenceClass</a></li>
@@ -61,6 +61,8 @@ <h5>class OperatorReferenceClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -71,7 +73,6 @@ <h5>class OperatorReferenceClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing-class.html b/testing/test_package_docs/fake/OtherGenericsThing-class.html
index 83cb3eb8aa..ef400e0cc3 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing-class.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class OtherGenericsThing<span class="signature">&lt;A&gt;</span></li>
+    <li class="self-crumb">OtherGenericsThing<span class="signature">&lt;A&gt;</span> class</li>
   </ol>
   <div class="self-name">OtherGenericsThing</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>OtherGenericsThing&lt;A&gt; class</h1>
 
     
 
@@ -221,7 +222,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class OtherGenericsThing</h5>
     <ol>
       <li class="section-title"><a href="fake/OtherGenericsThing-class.html#constructors">Constructors</a></li>
       <li><a href="fake/OtherGenericsThing/OtherGenericsThing.html">OtherGenericsThing</a></li>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/OtherGenericsThing.html b/testing/test_package_docs/fake/OtherGenericsThing/OtherGenericsThing.html
index 8cf7ee461c..a9f8ea6555 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/OtherGenericsThing.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/OtherGenericsThing.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
-    <li class="self-crumb">constructor OtherGenericsThing</li>
+    <li class="self-crumb">OtherGenericsThing constructor</li>
   </ol>
   <div class="self-name">OtherGenericsThing</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class OtherGenericsThing</h5>
+    <h5>OtherGenericsThing class</h5>
     <ol>
       <li class="section-title"><a href="fake/OtherGenericsThing-class.html#constructors">Constructors</a></li>
       <li><a href="fake/OtherGenericsThing/OtherGenericsThing.html">OtherGenericsThing</a></li>
@@ -62,6 +62,8 @@ <h5>class OtherGenericsThing</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>OtherGenericsThing&lt;A&gt; constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">OtherGenericsThing&lt;A&gt;</span>(<wbr>)
@@ -73,7 +75,6 @@ <h5>class OtherGenericsThing</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor OtherGenericsThing</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/convert.html b/testing/test_package_docs/fake/OtherGenericsThing/convert.html
index 88fc38ce29..bde1ed567a 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/convert.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/convert.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
-    <li class="self-crumb">method convert</li>
+    <li class="self-crumb">convert method</li>
   </ol>
   <div class="self-name">convert</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class OtherGenericsThing</h5>
+    <h5>OtherGenericsThing class</h5>
     <ol>
       <li class="section-title"><a href="fake/OtherGenericsThing-class.html#constructors">Constructors</a></li>
       <li><a href="fake/OtherGenericsThing/OtherGenericsThing.html">OtherGenericsThing</a></li>
@@ -62,6 +62,8 @@ <h5>class OtherGenericsThing</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>convert method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype"><a href="fake/HasGenerics-class.html">HasGenerics</a><span class="signature">&lt;A, <a href="fake/Cool-class.html">Cool</a>, String&gt;</span></span>
       <span class="name ">convert</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class OtherGenericsThing</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method convert</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/hashCode.html b/testing/test_package_docs/fake/OtherGenericsThing/hashCode.html
index 78cd396d59..d22b149209 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/hashCode.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class OtherGenericsThing</h5>
+    <h5>OtherGenericsThing class</h5>
     <ol>
       <li class="section-title"><a href="fake/OtherGenericsThing-class.html#constructors">Constructors</a></li>
       <li><a href="fake/OtherGenericsThing/OtherGenericsThing.html">OtherGenericsThing</a></li>
@@ -62,6 +62,8 @@ <h5>class OtherGenericsThing</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class OtherGenericsThing</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/noSuchMethod.html b/testing/test_package_docs/fake/OtherGenericsThing/noSuchMethod.html
index 81eabd0bd6..693091fc27 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/noSuchMethod.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class OtherGenericsThing</h5>
+    <h5>OtherGenericsThing class</h5>
     <ol>
       <li class="section-title"><a href="fake/OtherGenericsThing-class.html#constructors">Constructors</a></li>
       <li><a href="fake/OtherGenericsThing/OtherGenericsThing.html">OtherGenericsThing</a></li>
@@ -62,6 +62,8 @@ <h5>class OtherGenericsThing</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -72,7 +74,6 @@ <h5>class OtherGenericsThing</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/operator_equals.html b/testing/test_package_docs/fake/OtherGenericsThing/operator_equals.html
index 1e77bccd34..874405dba0 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/operator_equals.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class OtherGenericsThing</h5>
+    <h5>OtherGenericsThing class</h5>
     <ol>
       <li class="section-title"><a href="fake/OtherGenericsThing-class.html#constructors">Constructors</a></li>
       <li><a href="fake/OtherGenericsThing/OtherGenericsThing.html">OtherGenericsThing</a></li>
@@ -62,6 +62,8 @@ <h5>class OtherGenericsThing</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -72,7 +74,6 @@ <h5>class OtherGenericsThing</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/runtimeType.html b/testing/test_package_docs/fake/OtherGenericsThing/runtimeType.html
index 6b28257657..4e0b83c193 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/runtimeType.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class OtherGenericsThing</h5>
+    <h5>OtherGenericsThing class</h5>
     <ol>
       <li class="section-title"><a href="fake/OtherGenericsThing-class.html#constructors">Constructors</a></li>
       <li><a href="fake/OtherGenericsThing/OtherGenericsThing.html">OtherGenericsThing</a></li>
@@ -62,6 +62,8 @@ <h5>class OtherGenericsThing</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class OtherGenericsThing</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/toString.html b/testing/test_package_docs/fake/OtherGenericsThing/toString.html
index b3d5401544..452f1c8e93 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/toString.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class OtherGenericsThing</h5>
+    <h5>OtherGenericsThing class</h5>
     <ol>
       <li class="section-title"><a href="fake/OtherGenericsThing-class.html#constructors">Constructors</a></li>
       <li><a href="fake/OtherGenericsThing/OtherGenericsThing.html">OtherGenericsThing</a></li>
@@ -62,6 +62,8 @@ <h5>class OtherGenericsThing</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class OtherGenericsThing</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/PI-constant.html b/testing/test_package_docs/fake/PI-constant.html
index 843263d934..fd11cc75fb 100644
--- a/testing/test_package_docs/fake/PI-constant.html
+++ b/testing/test_package_docs/fake/PI-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">constant PI</li>
+    <li class="self-crumb">PI constant</li>
   </ol>
   <div class="self-name">PI</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>PI top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name ">PI</span>      =
@@ -143,7 +144,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property PI</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList-class.html b/testing/test_package_docs/fake/SpecialList-class.html
index f60c12d774..4b3ec27bf3 100644
--- a/testing/test_package_docs/fake/SpecialList-class.html
+++ b/testing/test_package_docs/fake/SpecialList-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class SpecialList<span class="signature">&lt;E&gt;</span></li>
+    <li class="self-crumb">SpecialList<span class="signature">&lt;E&gt;</span> class</li>
   </ol>
   <div class="self-name">SpecialList</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>SpecialList&lt;E&gt; class</h1>
 
     <section class="desc markdown">
       <p>Extends <code>ListBase</code></p>
@@ -693,7 +694,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class SpecialList</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/SpecialList.html b/testing/test_package_docs/fake/SpecialList/SpecialList.html
index 74d20550ce..fd1fd00200 100644
--- a/testing/test_package_docs/fake/SpecialList/SpecialList.html
+++ b/testing/test_package_docs/fake/SpecialList/SpecialList.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">constructor SpecialList</li>
+    <li class="self-crumb">SpecialList constructor</li>
   </ol>
   <div class="self-name">SpecialList</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>SpecialList&lt;E&gt; constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">SpecialList&lt;E&gt;</span>(<wbr>)
@@ -124,7 +126,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/add.html b/testing/test_package_docs/fake/SpecialList/add.html
index d2f804bc1d..8e7a09c261 100644
--- a/testing/test_package_docs/fake/SpecialList/add.html
+++ b/testing/test_package_docs/fake/SpecialList/add.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method add</li>
+    <li class="self-crumb">add method</li>
   </ol>
   <div class="self-name">add</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>add method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">add</span>(<wbr><span class="parameter" id="add-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method add</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/addAll.html b/testing/test_package_docs/fake/SpecialList/addAll.html
index 2a74994633..d9c60af2c0 100644
--- a/testing/test_package_docs/fake/SpecialList/addAll.html
+++ b/testing/test_package_docs/fake/SpecialList/addAll.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method addAll</li>
+    <li class="self-crumb">addAll method</li>
   </ol>
   <div class="self-name">addAll</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>addAll method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">addAll</span>(<wbr><span class="parameter" id="addAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;E&gt;</span></span> <span class="parameter-name">iterable</span></span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method addAll</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/any.html b/testing/test_package_docs/fake/SpecialList/any.html
index 130484ce2b..c7d9ef00bf 100644
--- a/testing/test_package_docs/fake/SpecialList/any.html
+++ b/testing/test_package_docs/fake/SpecialList/any.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method any</li>
+    <li class="self-crumb">any method</li>
   </ol>
   <div class="self-name">any</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>any method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">any</span>(<wbr><span class="parameter" id="any-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method any</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/asMap.html b/testing/test_package_docs/fake/SpecialList/asMap.html
index a80410bc0c..2c02a5648a 100644
--- a/testing/test_package_docs/fake/SpecialList/asMap.html
+++ b/testing/test_package_docs/fake/SpecialList/asMap.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method asMap</li>
+    <li class="self-crumb">asMap method</li>
   </ol>
   <div class="self-name">asMap</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>asMap method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Map<span class="signature">&lt;int, E&gt;</span></span>
       <span class="name ">asMap</span>(<wbr>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method asMap</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/clear.html b/testing/test_package_docs/fake/SpecialList/clear.html
index e29c262727..a7b42e8ea2 100644
--- a/testing/test_package_docs/fake/SpecialList/clear.html
+++ b/testing/test_package_docs/fake/SpecialList/clear.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method clear</li>
+    <li class="self-crumb">clear method</li>
   </ol>
   <div class="self-name">clear</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>clear method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">clear</span>(<wbr>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method clear</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/contains.html b/testing/test_package_docs/fake/SpecialList/contains.html
index 09aa2b09a2..45f8c54928 100644
--- a/testing/test_package_docs/fake/SpecialList/contains.html
+++ b/testing/test_package_docs/fake/SpecialList/contains.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method contains</li>
+    <li class="self-crumb">contains method</li>
   </ol>
   <div class="self-name">contains</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>contains method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">contains</span>(<wbr><span class="parameter" id="contains-param-element"><span class="type-annotation">Object</span> <span class="parameter-name">element</span></span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method contains</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/elementAt.html b/testing/test_package_docs/fake/SpecialList/elementAt.html
index 0810b45159..c5220d0164 100644
--- a/testing/test_package_docs/fake/SpecialList/elementAt.html
+++ b/testing/test_package_docs/fake/SpecialList/elementAt.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method elementAt</li>
+    <li class="self-crumb">elementAt method</li>
   </ol>
   <div class="self-name">elementAt</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>elementAt method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">E</span>
       <span class="name ">elementAt</span>(<wbr><span class="parameter" id="elementAt-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span></span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method elementAt</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/every.html b/testing/test_package_docs/fake/SpecialList/every.html
index 3e9aa32a5a..4f06b32259 100644
--- a/testing/test_package_docs/fake/SpecialList/every.html
+++ b/testing/test_package_docs/fake/SpecialList/every.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method every</li>
+    <li class="self-crumb">every method</li>
   </ol>
   <div class="self-name">every</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>every method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">every</span>(<wbr><span class="parameter" id="every-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method every</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/expand.html b/testing/test_package_docs/fake/SpecialList/expand.html
index a1f349c42e..2d0548a220 100644
--- a/testing/test_package_docs/fake/SpecialList/expand.html
+++ b/testing/test_package_docs/fake/SpecialList/expand.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method expand&lt;T&gt;</li>
+    <li class="self-crumb">expand&lt;T&gt; method</li>
   </ol>
   <div class="self-name">expand</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>expand&lt;T&gt; method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Iterable<span class="signature">&lt;T&gt;</span></span>
       <span class="name ">expand</span>&lt;T&gt;(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable<span class="signature">&lt;T&gt;</span></span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method expand</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/fillRange.html b/testing/test_package_docs/fake/SpecialList/fillRange.html
index d931e78f67..d3412b7b3c 100644
--- a/testing/test_package_docs/fake/SpecialList/fillRange.html
+++ b/testing/test_package_docs/fake/SpecialList/fillRange.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method fillRange</li>
+    <li class="self-crumb">fillRange method</li>
   </ol>
   <div class="self-name">fillRange</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>fillRange method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">fillRange</span>(<wbr><span class="parameter" id="fillRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="fillRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, [</span> <span class="parameter" id="fillRange-param-fill"><span class="type-annotation">E</span> <span class="parameter-name">fill</span></span> ])
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method fillRange</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/first.html b/testing/test_package_docs/fake/SpecialList/first.html
index 603dc19462..3eae53ddd8 100644
--- a/testing/test_package_docs/fake/SpecialList/first.html
+++ b/testing/test_package_docs/fake/SpecialList/first.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">property first</li>
+    <li class="self-crumb">first property</li>
   </ol>
   <div class="self-name">first</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>first property</h1>
+
 
         <section id="getter">
         
@@ -127,7 +129,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property first</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/firstWhere.html b/testing/test_package_docs/fake/SpecialList/firstWhere.html
index 80eb74068e..d2ab96d344 100644
--- a/testing/test_package_docs/fake/SpecialList/firstWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/firstWhere.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method firstWhere</li>
+    <li class="self-crumb">firstWhere method</li>
   </ol>
   <div class="self-name">firstWhere</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>firstWhere method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">E</span>
       <span class="name ">firstWhere</span>(<wbr><span class="parameter" id="firstWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), {</span> <span class="parameter" id="firstWhere-param-orElse"><span class="type-annotation">E</span> <span class="parameter-name">orElse</span>()</span> })
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method firstWhere</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/fold.html b/testing/test_package_docs/fake/SpecialList/fold.html
index 3c38c7d0da..6590c67a06 100644
--- a/testing/test_package_docs/fake/SpecialList/fold.html
+++ b/testing/test_package_docs/fake/SpecialList/fold.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method fold&lt;T&gt;</li>
+    <li class="self-crumb">fold&lt;T&gt; method</li>
   </ol>
   <div class="self-name">fold</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>fold&lt;T&gt; method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">T</span>
       <span class="name ">fold</span>&lt;T&gt;(<wbr><span class="parameter" id="fold-param-initialValue"><span class="type-annotation">T</span> <span class="parameter-name">initialValue</span>, </span> <span class="parameter" id="fold-param-combine"><span class="type-annotation">T</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="type-annotation">T</span> <span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method fold</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/forEach.html b/testing/test_package_docs/fake/SpecialList/forEach.html
index 071d262ba0..664b5e484c 100644
--- a/testing/test_package_docs/fake/SpecialList/forEach.html
+++ b/testing/test_package_docs/fake/SpecialList/forEach.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method forEach</li>
+    <li class="self-crumb">forEach method</li>
   </ol>
   <div class="self-name">forEach</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>forEach method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">forEach</span>(<wbr><span class="parameter" id="forEach-param-action"><span class="type-annotation">void</span> <span class="parameter-name">action</span>(<span class="parameter" id="action-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method forEach</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/getRange.html b/testing/test_package_docs/fake/SpecialList/getRange.html
index 7fc81bfb3d..2e68592f7e 100644
--- a/testing/test_package_docs/fake/SpecialList/getRange.html
+++ b/testing/test_package_docs/fake/SpecialList/getRange.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method getRange</li>
+    <li class="self-crumb">getRange method</li>
   </ol>
   <div class="self-name">getRange</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>getRange method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Iterable<span class="signature">&lt;E&gt;</span></span>
       <span class="name ">getRange</span>(<wbr><span class="parameter" id="getRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="getRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span></span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method getRange</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/hashCode.html b/testing/test_package_docs/fake/SpecialList/hashCode.html
index 45faaf815f..9f1a747d63 100644
--- a/testing/test_package_docs/fake/SpecialList/hashCode.html
+++ b/testing/test_package_docs/fake/SpecialList/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -127,7 +129,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/indexOf.html b/testing/test_package_docs/fake/SpecialList/indexOf.html
index b42a8e01ba..1f2ee3142b 100644
--- a/testing/test_package_docs/fake/SpecialList/indexOf.html
+++ b/testing/test_package_docs/fake/SpecialList/indexOf.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method indexOf</li>
+    <li class="self-crumb">indexOf method</li>
   </ol>
   <div class="self-name">indexOf</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>indexOf method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">int</span>
       <span class="name ">indexOf</span>(<wbr><span class="parameter" id="indexOf-param-element"><span class="type-annotation">Object</span> <span class="parameter-name">element</span>, [</span> <span class="parameter" id="indexOf-param-startIndex"><span class="type-annotation">int</span> <span class="parameter-name">startIndex</span> = <span class="default-value">0</span></span> ])
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method indexOf</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/insert.html b/testing/test_package_docs/fake/SpecialList/insert.html
index 614f6d9377..a31cfdc2ef 100644
--- a/testing/test_package_docs/fake/SpecialList/insert.html
+++ b/testing/test_package_docs/fake/SpecialList/insert.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method insert</li>
+    <li class="self-crumb">insert method</li>
   </ol>
   <div class="self-name">insert</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>insert method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">insert</span>(<wbr><span class="parameter" id="insert-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="insert-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method insert</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/insertAll.html b/testing/test_package_docs/fake/SpecialList/insertAll.html
index 19fde0c835..58380698ea 100644
--- a/testing/test_package_docs/fake/SpecialList/insertAll.html
+++ b/testing/test_package_docs/fake/SpecialList/insertAll.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method insertAll</li>
+    <li class="self-crumb">insertAll method</li>
   </ol>
   <div class="self-name">insertAll</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>insertAll method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">insertAll</span>(<wbr><span class="parameter" id="insertAll-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="insertAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;E&gt;</span></span> <span class="parameter-name">iterable</span></span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method insertAll</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/isEmpty.html b/testing/test_package_docs/fake/SpecialList/isEmpty.html
index 65ea406f8d..02b57d0720 100644
--- a/testing/test_package_docs/fake/SpecialList/isEmpty.html
+++ b/testing/test_package_docs/fake/SpecialList/isEmpty.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">property isEmpty</li>
+    <li class="self-crumb">isEmpty property</li>
   </ol>
   <div class="self-name">isEmpty</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>isEmpty property</h1>
+
 
         <section id="getter">
         
@@ -127,7 +129,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property isEmpty</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/isNotEmpty.html b/testing/test_package_docs/fake/SpecialList/isNotEmpty.html
index f903511eba..8de961253b 100644
--- a/testing/test_package_docs/fake/SpecialList/isNotEmpty.html
+++ b/testing/test_package_docs/fake/SpecialList/isNotEmpty.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">property isNotEmpty</li>
+    <li class="self-crumb">isNotEmpty property</li>
   </ol>
   <div class="self-name">isNotEmpty</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>isNotEmpty property</h1>
+
 
         <section id="getter">
         
@@ -127,7 +129,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property isNotEmpty</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/iterator.html b/testing/test_package_docs/fake/SpecialList/iterator.html
index 93841510cd..6ec4bd189f 100644
--- a/testing/test_package_docs/fake/SpecialList/iterator.html
+++ b/testing/test_package_docs/fake/SpecialList/iterator.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">property iterator</li>
+    <li class="self-crumb">iterator property</li>
   </ol>
   <div class="self-name">iterator</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>iterator property</h1>
+
 
         <section id="getter">
         
@@ -127,7 +129,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property iterator</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/join.html b/testing/test_package_docs/fake/SpecialList/join.html
index 0bc20d4c41..8ce6979ab4 100644
--- a/testing/test_package_docs/fake/SpecialList/join.html
+++ b/testing/test_package_docs/fake/SpecialList/join.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method join</li>
+    <li class="self-crumb">join method</li>
   </ol>
   <div class="self-name">join</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>join method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">join</span>(<wbr>[<span class="parameter" id="join-param-separator"><span class="type-annotation">String</span> <span class="parameter-name">separator</span> = <span class="default-value">""</span></span> ])
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method join</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/last.html b/testing/test_package_docs/fake/SpecialList/last.html
index 4ac88d0eb5..74ba27d57b 100644
--- a/testing/test_package_docs/fake/SpecialList/last.html
+++ b/testing/test_package_docs/fake/SpecialList/last.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">property last</li>
+    <li class="self-crumb">last property</li>
   </ol>
   <div class="self-name">last</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>last property</h1>
+
 
         <section id="getter">
         
@@ -127,7 +129,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property last</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/lastIndexOf.html b/testing/test_package_docs/fake/SpecialList/lastIndexOf.html
index e4b9b5deea..51feb31ab7 100644
--- a/testing/test_package_docs/fake/SpecialList/lastIndexOf.html
+++ b/testing/test_package_docs/fake/SpecialList/lastIndexOf.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method lastIndexOf</li>
+    <li class="self-crumb">lastIndexOf method</li>
   </ol>
   <div class="self-name">lastIndexOf</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>lastIndexOf method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">int</span>
       <span class="name ">lastIndexOf</span>(<wbr><span class="parameter" id="lastIndexOf-param-element"><span class="type-annotation">Object</span> <span class="parameter-name">element</span>, [</span> <span class="parameter" id="lastIndexOf-param-startIndex"><span class="type-annotation">int</span> <span class="parameter-name">startIndex</span></span> ])
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method lastIndexOf</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/lastWhere.html b/testing/test_package_docs/fake/SpecialList/lastWhere.html
index 781c673937..c2723b44da 100644
--- a/testing/test_package_docs/fake/SpecialList/lastWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/lastWhere.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method lastWhere</li>
+    <li class="self-crumb">lastWhere method</li>
   </ol>
   <div class="self-name">lastWhere</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>lastWhere method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">E</span>
       <span class="name ">lastWhere</span>(<wbr><span class="parameter" id="lastWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), {</span> <span class="parameter" id="lastWhere-param-orElse"><span class="type-annotation">E</span> <span class="parameter-name">orElse</span>()</span> })
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method lastWhere</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/length.html b/testing/test_package_docs/fake/SpecialList/length.html
index 7306990cc8..a1443cab3a 100644
--- a/testing/test_package_docs/fake/SpecialList/length.html
+++ b/testing/test_package_docs/fake/SpecialList/length.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">property length</li>
+    <li class="self-crumb">length property</li>
   </ol>
   <div class="self-name">length</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>length property</h1>
+
 
         <section id="getter">
         
@@ -137,7 +139,6 @@ <h5>class SpecialList</h5>
           </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property length</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/map.html b/testing/test_package_docs/fake/SpecialList/map.html
index 356435a929..103df26767 100644
--- a/testing/test_package_docs/fake/SpecialList/map.html
+++ b/testing/test_package_docs/fake/SpecialList/map.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method map&lt;T&gt;</li>
+    <li class="self-crumb">map&lt;T&gt; method</li>
   </ol>
   <div class="self-name">map</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>map&lt;T&gt; method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Iterable<span class="signature">&lt;T&gt;</span></span>
       <span class="name ">map</span>&lt;T&gt;(<wbr><span class="parameter" id="map-param-f"><span class="type-annotation">T</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method map</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/noSuchMethod.html b/testing/test_package_docs/fake/SpecialList/noSuchMethod.html
index 6bf5f485be..13eaee1c3e 100644
--- a/testing/test_package_docs/fake/SpecialList/noSuchMethod.html
+++ b/testing/test_package_docs/fake/SpecialList/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/operator_equals.html b/testing/test_package_docs/fake/SpecialList/operator_equals.html
index a11e58882c..4d76b3e539 100644
--- a/testing/test_package_docs/fake/SpecialList/operator_equals.html
+++ b/testing/test_package_docs/fake/SpecialList/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/operator_get.html b/testing/test_package_docs/fake/SpecialList/operator_get.html
index 8b8ec63373..6e428e277a 100644
--- a/testing/test_package_docs/fake/SpecialList/operator_get.html
+++ b/testing/test_package_docs/fake/SpecialList/operator_get.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method operator []</li>
+    <li class="self-crumb">operator [] method</li>
   </ol>
   <div class="self-name">operator []</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator [] method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">E</span>
       <span class="name ">operator []</span>(<wbr><span class="parameter" id="[]-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span></span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator []</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/operator_put.html b/testing/test_package_docs/fake/SpecialList/operator_put.html
index 6bb38245af..69974c0a9a 100644
--- a/testing/test_package_docs/fake/SpecialList/operator_put.html
+++ b/testing/test_package_docs/fake/SpecialList/operator_put.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method operator []=</li>
+    <li class="self-crumb">operator []= method</li>
   </ol>
   <div class="self-name">operator []=</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator []= method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">operator []=</span>(<wbr><span class="parameter" id="[]=-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="[]=-param-value"><span class="type-annotation">E</span> <span class="parameter-name">value</span></span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator []=</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/reduce.html b/testing/test_package_docs/fake/SpecialList/reduce.html
index 1e636d4717..b5e41fb5d5 100644
--- a/testing/test_package_docs/fake/SpecialList/reduce.html
+++ b/testing/test_package_docs/fake/SpecialList/reduce.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method reduce</li>
+    <li class="self-crumb">reduce method</li>
   </ol>
   <div class="self-name">reduce</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>reduce method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">E</span>
       <span class="name ">reduce</span>(<wbr><span class="parameter" id="reduce-param-combine"><span class="type-annotation">E</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="type-annotation">E</span> <span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method reduce</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/remove.html b/testing/test_package_docs/fake/SpecialList/remove.html
index 5d1f8292c0..ab50eb63d5 100644
--- a/testing/test_package_docs/fake/SpecialList/remove.html
+++ b/testing/test_package_docs/fake/SpecialList/remove.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method remove</li>
+    <li class="self-crumb">remove method</li>
   </ol>
   <div class="self-name">remove</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>remove method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">remove</span>(<wbr><span class="parameter" id="remove-param-element"><span class="type-annotation">Object</span> <span class="parameter-name">element</span></span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method remove</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/removeAt.html b/testing/test_package_docs/fake/SpecialList/removeAt.html
index e2211679e3..11248ff052 100644
--- a/testing/test_package_docs/fake/SpecialList/removeAt.html
+++ b/testing/test_package_docs/fake/SpecialList/removeAt.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method removeAt</li>
+    <li class="self-crumb">removeAt method</li>
   </ol>
   <div class="self-name">removeAt</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>removeAt method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">E</span>
       <span class="name ">removeAt</span>(<wbr><span class="parameter" id="removeAt-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span></span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method removeAt</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/removeLast.html b/testing/test_package_docs/fake/SpecialList/removeLast.html
index 6646d2d89e..10b7c76f59 100644
--- a/testing/test_package_docs/fake/SpecialList/removeLast.html
+++ b/testing/test_package_docs/fake/SpecialList/removeLast.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method removeLast</li>
+    <li class="self-crumb">removeLast method</li>
   </ol>
   <div class="self-name">removeLast</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>removeLast method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">E</span>
       <span class="name ">removeLast</span>(<wbr>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method removeLast</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/removeRange.html b/testing/test_package_docs/fake/SpecialList/removeRange.html
index 1b089a2609..ca8c74695b 100644
--- a/testing/test_package_docs/fake/SpecialList/removeRange.html
+++ b/testing/test_package_docs/fake/SpecialList/removeRange.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method removeRange</li>
+    <li class="self-crumb">removeRange method</li>
   </ol>
   <div class="self-name">removeRange</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>removeRange method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">removeRange</span>(<wbr><span class="parameter" id="removeRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="removeRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span></span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method removeRange</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/removeWhere.html b/testing/test_package_docs/fake/SpecialList/removeWhere.html
index 3d5e5d9c19..3bd4727e89 100644
--- a/testing/test_package_docs/fake/SpecialList/removeWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/removeWhere.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method removeWhere</li>
+    <li class="self-crumb">removeWhere method</li>
   </ol>
   <div class="self-name">removeWhere</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>removeWhere method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">removeWhere</span>(<wbr><span class="parameter" id="removeWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method removeWhere</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/replaceRange.html b/testing/test_package_docs/fake/SpecialList/replaceRange.html
index b950882f34..ddbfba38d5 100644
--- a/testing/test_package_docs/fake/SpecialList/replaceRange.html
+++ b/testing/test_package_docs/fake/SpecialList/replaceRange.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method replaceRange</li>
+    <li class="self-crumb">replaceRange method</li>
   </ol>
   <div class="self-name">replaceRange</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>replaceRange method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">replaceRange</span>(<wbr><span class="parameter" id="replaceRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="replaceRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, </span> <span class="parameter" id="replaceRange-param-newContents"><span class="type-annotation">Iterable<span class="signature">&lt;E&gt;</span></span> <span class="parameter-name">newContents</span></span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method replaceRange</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/retainWhere.html b/testing/test_package_docs/fake/SpecialList/retainWhere.html
index 1b6ad130ee..51b0edad42 100644
--- a/testing/test_package_docs/fake/SpecialList/retainWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/retainWhere.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method retainWhere</li>
+    <li class="self-crumb">retainWhere method</li>
   </ol>
   <div class="self-name">retainWhere</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>retainWhere method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">retainWhere</span>(<wbr><span class="parameter" id="retainWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method retainWhere</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/reversed.html b/testing/test_package_docs/fake/SpecialList/reversed.html
index 54686dbe69..793634e266 100644
--- a/testing/test_package_docs/fake/SpecialList/reversed.html
+++ b/testing/test_package_docs/fake/SpecialList/reversed.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">property reversed</li>
+    <li class="self-crumb">reversed property</li>
   </ol>
   <div class="self-name">reversed</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>reversed property</h1>
+
 
         <section id="getter">
         
@@ -127,7 +129,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property reversed</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/runtimeType.html b/testing/test_package_docs/fake/SpecialList/runtimeType.html
index 730ac20d14..8ad95ebe6e 100644
--- a/testing/test_package_docs/fake/SpecialList/runtimeType.html
+++ b/testing/test_package_docs/fake/SpecialList/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -127,7 +129,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/setAll.html b/testing/test_package_docs/fake/SpecialList/setAll.html
index 18b442bc75..e6c6425d1f 100644
--- a/testing/test_package_docs/fake/SpecialList/setAll.html
+++ b/testing/test_package_docs/fake/SpecialList/setAll.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method setAll</li>
+    <li class="self-crumb">setAll method</li>
   </ol>
   <div class="self-name">setAll</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>setAll method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">setAll</span>(<wbr><span class="parameter" id="setAll-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="setAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;E&gt;</span></span> <span class="parameter-name">iterable</span></span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method setAll</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/setRange.html b/testing/test_package_docs/fake/SpecialList/setRange.html
index 3dddad2f4a..34780c274f 100644
--- a/testing/test_package_docs/fake/SpecialList/setRange.html
+++ b/testing/test_package_docs/fake/SpecialList/setRange.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method setRange</li>
+    <li class="self-crumb">setRange method</li>
   </ol>
   <div class="self-name">setRange</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>setRange method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">setRange</span>(<wbr><span class="parameter" id="setRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="setRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, </span> <span class="parameter" id="setRange-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;E&gt;</span></span> <span class="parameter-name">iterable</span>, [</span> <span class="parameter" id="setRange-param-skipCount"><span class="type-annotation">int</span> <span class="parameter-name">skipCount</span> = <span class="default-value">0</span></span> ])
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method setRange</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/shuffle.html b/testing/test_package_docs/fake/SpecialList/shuffle.html
index 9e7d1a37b9..2c532bb455 100644
--- a/testing/test_package_docs/fake/SpecialList/shuffle.html
+++ b/testing/test_package_docs/fake/SpecialList/shuffle.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method shuffle</li>
+    <li class="self-crumb">shuffle method</li>
   </ol>
   <div class="self-name">shuffle</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>shuffle method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">shuffle</span>(<wbr>[<span class="parameter" id="shuffle-param-random"><span class="type-annotation">Random</span> <span class="parameter-name">random</span></span> ])
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method shuffle</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/single.html b/testing/test_package_docs/fake/SpecialList/single.html
index 1145ae9e07..2bfc0ab8ab 100644
--- a/testing/test_package_docs/fake/SpecialList/single.html
+++ b/testing/test_package_docs/fake/SpecialList/single.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">property single</li>
+    <li class="self-crumb">single property</li>
   </ol>
   <div class="self-name">single</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>single property</h1>
+
 
         <section id="getter">
         
@@ -127,7 +129,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property single</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/singleWhere.html b/testing/test_package_docs/fake/SpecialList/singleWhere.html
index c68fe4cb14..c78ae195d1 100644
--- a/testing/test_package_docs/fake/SpecialList/singleWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/singleWhere.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method singleWhere</li>
+    <li class="self-crumb">singleWhere method</li>
   </ol>
   <div class="self-name">singleWhere</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>singleWhere method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">E</span>
       <span class="name ">singleWhere</span>(<wbr><span class="parameter" id="singleWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method singleWhere</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/skip.html b/testing/test_package_docs/fake/SpecialList/skip.html
index 8ea6a8452a..77b78dd2ad 100644
--- a/testing/test_package_docs/fake/SpecialList/skip.html
+++ b/testing/test_package_docs/fake/SpecialList/skip.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method skip</li>
+    <li class="self-crumb">skip method</li>
   </ol>
   <div class="self-name">skip</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>skip method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Iterable<span class="signature">&lt;E&gt;</span></span>
       <span class="name ">skip</span>(<wbr><span class="parameter" id="skip-param-count"><span class="type-annotation">int</span> <span class="parameter-name">count</span></span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method skip</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/skipWhile.html b/testing/test_package_docs/fake/SpecialList/skipWhile.html
index 7e31aa26fc..68f10ae503 100644
--- a/testing/test_package_docs/fake/SpecialList/skipWhile.html
+++ b/testing/test_package_docs/fake/SpecialList/skipWhile.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method skipWhile</li>
+    <li class="self-crumb">skipWhile method</li>
   </ol>
   <div class="self-name">skipWhile</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>skipWhile method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Iterable<span class="signature">&lt;E&gt;</span></span>
       <span class="name ">skipWhile</span>(<wbr><span class="parameter" id="skipWhile-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method skipWhile</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/sort.html b/testing/test_package_docs/fake/SpecialList/sort.html
index 9804abff8d..d5f5a46192 100644
--- a/testing/test_package_docs/fake/SpecialList/sort.html
+++ b/testing/test_package_docs/fake/SpecialList/sort.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method sort</li>
+    <li class="self-crumb">sort method</li>
   </ol>
   <div class="self-name">sort</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>sort method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">sort</span>(<wbr>[<span class="parameter" id="sort-param-compare"><span class="type-annotation">int</span> <span class="parameter-name">compare</span>(<span class="parameter" id="compare-param-a"><span class="type-annotation">E</span> <span class="parameter-name">a</span>, </span> <span class="parameter" id="compare-param-b"><span class="type-annotation">E</span> <span class="parameter-name">b</span></span>)</span> ])
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method sort</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/sublist.html b/testing/test_package_docs/fake/SpecialList/sublist.html
index e894238c7e..db7480e668 100644
--- a/testing/test_package_docs/fake/SpecialList/sublist.html
+++ b/testing/test_package_docs/fake/SpecialList/sublist.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method sublist</li>
+    <li class="self-crumb">sublist method</li>
   </ol>
   <div class="self-name">sublist</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>sublist method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">List<span class="signature">&lt;E&gt;</span></span>
       <span class="name ">sublist</span>(<wbr><span class="parameter" id="sublist-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, [</span> <span class="parameter" id="sublist-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span></span> ])
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method sublist</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/take.html b/testing/test_package_docs/fake/SpecialList/take.html
index db56e341a6..aedc22b079 100644
--- a/testing/test_package_docs/fake/SpecialList/take.html
+++ b/testing/test_package_docs/fake/SpecialList/take.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method take</li>
+    <li class="self-crumb">take method</li>
   </ol>
   <div class="self-name">take</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>take method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Iterable<span class="signature">&lt;E&gt;</span></span>
       <span class="name ">take</span>(<wbr><span class="parameter" id="take-param-count"><span class="type-annotation">int</span> <span class="parameter-name">count</span></span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method take</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/takeWhile.html b/testing/test_package_docs/fake/SpecialList/takeWhile.html
index 39b4eeb2de..3fc0d75f74 100644
--- a/testing/test_package_docs/fake/SpecialList/takeWhile.html
+++ b/testing/test_package_docs/fake/SpecialList/takeWhile.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method takeWhile</li>
+    <li class="self-crumb">takeWhile method</li>
   </ol>
   <div class="self-name">takeWhile</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>takeWhile method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Iterable<span class="signature">&lt;E&gt;</span></span>
       <span class="name ">takeWhile</span>(<wbr><span class="parameter" id="takeWhile-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method takeWhile</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/toList.html b/testing/test_package_docs/fake/SpecialList/toList.html
index c66719349f..d344ef10b3 100644
--- a/testing/test_package_docs/fake/SpecialList/toList.html
+++ b/testing/test_package_docs/fake/SpecialList/toList.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method toList</li>
+    <li class="self-crumb">toList method</li>
   </ol>
   <div class="self-name">toList</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toList method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">List<span class="signature">&lt;E&gt;</span></span>
       <span class="name ">toList</span>(<wbr>{<span class="parameter" id="toList-param-growable"><span class="type-annotation">bool</span> <span class="parameter-name">growable</span>: <span class="default-value">true</span></span> })
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toList</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/toSet.html b/testing/test_package_docs/fake/SpecialList/toSet.html
index 5ce01ce802..d4f5b9fada 100644
--- a/testing/test_package_docs/fake/SpecialList/toSet.html
+++ b/testing/test_package_docs/fake/SpecialList/toSet.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method toSet</li>
+    <li class="self-crumb">toSet method</li>
   </ol>
   <div class="self-name">toSet</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toSet method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Set<span class="signature">&lt;E&gt;</span></span>
       <span class="name ">toSet</span>(<wbr>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toSet</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/toString.html b/testing/test_package_docs/fake/SpecialList/toString.html
index a3690f9862..dcdab4910b 100644
--- a/testing/test_package_docs/fake/SpecialList/toString.html
+++ b/testing/test_package_docs/fake/SpecialList/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SpecialList/where.html b/testing/test_package_docs/fake/SpecialList/where.html
index 3adab0f170..eadb01cf56 100644
--- a/testing/test_package_docs/fake/SpecialList/where.html
+++ b/testing/test_package_docs/fake/SpecialList/where.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">method where</li>
+    <li class="self-crumb">where method</li>
   </ol>
   <div class="self-name">where</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SpecialList</h5>
+    <h5>SpecialList class</h5>
     <ol>
       <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
@@ -113,6 +113,8 @@ <h5>class SpecialList</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>where method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Iterable<span class="signature">&lt;E&gt;</span></span>
       <span class="name ">where</span>(<wbr><span class="parameter" id="where-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
@@ -123,7 +125,6 @@ <h5>class SpecialList</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method where</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SubForDocComments-class.html b/testing/test_package_docs/fake/SubForDocComments-class.html
index b0d6711f58..a5c407a27f 100644
--- a/testing/test_package_docs/fake/SubForDocComments-class.html
+++ b/testing/test_package_docs/fake/SubForDocComments-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class SubForDocComments</li>
+    <li class="self-crumb">SubForDocComments class</li>
   </ol>
   <div class="self-name">SubForDocComments</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>SubForDocComments class</h1>
 
     <section class="desc markdown">
       <p>Testing if docs for inherited method are correct.</p>
@@ -256,7 +257,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class SubForDocComments</h5>
     <ol>
       <li class="section-title"><a href="fake/SubForDocComments-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SubForDocComments/SubForDocComments.html">SubForDocComments</a></li>
diff --git a/testing/test_package_docs/fake/SubForDocComments/SubForDocComments.html b/testing/test_package_docs/fake/SubForDocComments/SubForDocComments.html
index a3589a1d93..a7c8dffc3e 100644
--- a/testing/test_package_docs/fake/SubForDocComments/SubForDocComments.html
+++ b/testing/test_package_docs/fake/SubForDocComments/SubForDocComments.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
-    <li class="self-crumb">constructor SubForDocComments</li>
+    <li class="self-crumb">SubForDocComments constructor</li>
   </ol>
   <div class="self-name">SubForDocComments</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SubForDocComments</h5>
+    <h5>SubForDocComments class</h5>
     <ol>
       <li class="section-title"><a href="fake/SubForDocComments-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SubForDocComments/SubForDocComments.html">SubForDocComments</a></li>
@@ -64,6 +64,8 @@ <h5>class SubForDocComments</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>SubForDocComments constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">SubForDocComments</span>(<wbr>)
@@ -75,7 +77,6 @@ <h5>class SubForDocComments</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor SubForDocComments</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SubForDocComments/localMethod.html b/testing/test_package_docs/fake/SubForDocComments/localMethod.html
index 69137c86e8..2969ed2609 100644
--- a/testing/test_package_docs/fake/SubForDocComments/localMethod.html
+++ b/testing/test_package_docs/fake/SubForDocComments/localMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
-    <li class="self-crumb">method localMethod</li>
+    <li class="self-crumb">localMethod method</li>
   </ol>
   <div class="self-name">localMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SubForDocComments</h5>
+    <h5>SubForDocComments class</h5>
     <ol>
       <li class="section-title"><a href="fake/SubForDocComments-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SubForDocComments/SubForDocComments.html">SubForDocComments</a></li>
@@ -64,6 +64,8 @@ <h5>class SubForDocComments</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>localMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">localMethod</span>(<wbr><span class="parameter" id="localMethod-param-foo"><span class="type-annotation">String</span> <span class="parameter-name">foo</span>, </span> <span class="parameter" id="localMethod-param-bar"><span class="parameter-name">bar</span></span>)
@@ -77,7 +79,6 @@ <h5>class SubForDocComments</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method localMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass-class.html b/testing/test_package_docs/fake/SuperAwesomeClass-class.html
index 4384fa61b3..11fa4b9150 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass-class.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class <span class="deprecated">SuperAwesomeClass</span></li>
+    <li class="self-crumb"><span class="deprecated">SuperAwesomeClass</span> class</li>
   </ol>
   <div class="self-name">SuperAwesomeClass</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>SuperAwesomeClass class</h1>
 
     <section class="desc markdown">
       <p>A super class, with many powers. Link to <a href="ex/Apple-class.html">Apple</a> from another library.</p>
@@ -257,7 +258,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class SuperAwesomeClass</h5>
     <ol>
       <li class="section-title"><a href="fake/SuperAwesomeClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SuperAwesomeClass/SuperAwesomeClass.html">SuperAwesomeClass</a></li>
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass/SuperAwesomeClass.html b/testing/test_package_docs/fake/SuperAwesomeClass/SuperAwesomeClass.html
index 4f20c604e8..b317461f37 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass/SuperAwesomeClass.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass/SuperAwesomeClass.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
-    <li class="self-crumb">constructor SuperAwesomeClass</li>
+    <li class="self-crumb">SuperAwesomeClass constructor</li>
   </ol>
   <div class="self-name">SuperAwesomeClass</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SuperAwesomeClass</h5>
+    <h5>SuperAwesomeClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/SuperAwesomeClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SuperAwesomeClass/SuperAwesomeClass.html">SuperAwesomeClass</a></li>
@@ -64,6 +64,8 @@ <h5>class SuperAwesomeClass</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>SuperAwesomeClass constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">SuperAwesomeClass</span>(<wbr>)
@@ -75,7 +77,6 @@ <h5>class SuperAwesomeClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor SuperAwesomeClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass/fly.html b/testing/test_package_docs/fake/SuperAwesomeClass/fly.html
index e93528e812..9cd03e2d30 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass/fly.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass/fly.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
-    <li class="self-crumb">method fly</li>
+    <li class="self-crumb">fly method</li>
   </ol>
   <div class="self-name">fly</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SuperAwesomeClass</h5>
+    <h5>SuperAwesomeClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/SuperAwesomeClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SuperAwesomeClass/SuperAwesomeClass.html">SuperAwesomeClass</a></li>
@@ -64,6 +64,8 @@ <h5>class SuperAwesomeClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>fly method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">fly</span>(<wbr><span class="parameter" id="fly-param-height"><span class="type-annotation">int</span> <span class="parameter-name">height</span>, </span> <span class="parameter" id="fly-param-superCool"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">superCool</span>, {</span> <span class="parameter" id="fly-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span></span> })
@@ -78,7 +80,6 @@ <h5>class SuperAwesomeClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method fly</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass/hashCode.html b/testing/test_package_docs/fake/SuperAwesomeClass/hashCode.html
index 1e5a716a83..ae496e8b11 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass/hashCode.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SuperAwesomeClass</h5>
+    <h5>SuperAwesomeClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/SuperAwesomeClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SuperAwesomeClass/SuperAwesomeClass.html">SuperAwesomeClass</a></li>
@@ -64,6 +64,8 @@ <h5>class SuperAwesomeClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -78,7 +80,6 @@ <h5>class SuperAwesomeClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass/noSuchMethod.html b/testing/test_package_docs/fake/SuperAwesomeClass/noSuchMethod.html
index 187bd15a95..3db65fb393 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass/noSuchMethod.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SuperAwesomeClass</h5>
+    <h5>SuperAwesomeClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/SuperAwesomeClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SuperAwesomeClass/SuperAwesomeClass.html">SuperAwesomeClass</a></li>
@@ -64,6 +64,8 @@ <h5>class SuperAwesomeClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -74,7 +76,6 @@ <h5>class SuperAwesomeClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass/operator_equals.html b/testing/test_package_docs/fake/SuperAwesomeClass/operator_equals.html
index b388c7139f..ad87910bdc 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass/operator_equals.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SuperAwesomeClass</h5>
+    <h5>SuperAwesomeClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/SuperAwesomeClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SuperAwesomeClass/SuperAwesomeClass.html">SuperAwesomeClass</a></li>
@@ -64,6 +64,8 @@ <h5>class SuperAwesomeClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -74,7 +76,6 @@ <h5>class SuperAwesomeClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass/operator_minus.html b/testing/test_package_docs/fake/SuperAwesomeClass/operator_minus.html
index 1f65c43921..5664a2d350 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass/operator_minus.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass/operator_minus.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
-    <li class="self-crumb">method operator -</li>
+    <li class="self-crumb">operator - method</li>
   </ol>
   <div class="self-name">operator -</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SuperAwesomeClass</h5>
+    <h5>SuperAwesomeClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/SuperAwesomeClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SuperAwesomeClass/SuperAwesomeClass.html">SuperAwesomeClass</a></li>
@@ -64,6 +64,8 @@ <h5>class SuperAwesomeClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator - method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype"><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></span>
       <span class="name ">operator -</span>(<wbr><span class="parameter" id="--param-other"><span class="parameter-name">other</span></span>)
@@ -74,7 +76,6 @@ <h5>class SuperAwesomeClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator -</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass/powers.html b/testing/test_package_docs/fake/SuperAwesomeClass/powers.html
index 96229fbe0d..d1b7971be3 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass/powers.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass/powers.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
-    <li class="self-crumb">property powers</li>
+    <li class="self-crumb">powers property</li>
   </ol>
   <div class="self-name">powers</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SuperAwesomeClass</h5>
+    <h5>SuperAwesomeClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/SuperAwesomeClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SuperAwesomeClass/SuperAwesomeClass.html">SuperAwesomeClass</a></li>
@@ -64,6 +64,8 @@ <h5>class SuperAwesomeClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>powers property</h1>
+
         <section class="multi-line-signature">
           <span class="returntype">List<span class="signature">&lt;String&gt;</span></span>
           <span class="name ">powers</span>          <div class="features">read / write</div>
@@ -76,7 +78,6 @@ <h5>class SuperAwesomeClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property powers</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass/runtimeType.html b/testing/test_package_docs/fake/SuperAwesomeClass/runtimeType.html
index b4d9d182fa..8e86476a3a 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass/runtimeType.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SuperAwesomeClass</h5>
+    <h5>SuperAwesomeClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/SuperAwesomeClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SuperAwesomeClass/SuperAwesomeClass.html">SuperAwesomeClass</a></li>
@@ -64,6 +64,8 @@ <h5>class SuperAwesomeClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -78,7 +80,6 @@ <h5>class SuperAwesomeClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass/toString.html b/testing/test_package_docs/fake/SuperAwesomeClass/toString.html
index 2e27f6fc67..3c5a9a3860 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass/toString.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SuperAwesomeClass</h5>
+    <h5>SuperAwesomeClass class</h5>
     <ol>
       <li class="section-title"><a href="fake/SuperAwesomeClass-class.html#constructors">Constructors</a></li>
       <li><a href="fake/SuperAwesomeClass/SuperAwesomeClass.html">SuperAwesomeClass</a></li>
@@ -64,6 +64,8 @@ <h5>class SuperAwesomeClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -74,7 +76,6 @@ <h5>class SuperAwesomeClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/UP-constant.html b/testing/test_package_docs/fake/UP-constant.html
index 094985a63c..8af16c6911 100644
--- a/testing/test_package_docs/fake/UP-constant.html
+++ b/testing/test_package_docs/fake/UP-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">constant UP</li>
+    <li class="self-crumb">UP constant</li>
   </ol>
   <div class="self-name">UP</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>UP top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name ">UP</span>      =
@@ -144,7 +145,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property UP</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/VoidCallback.html b/testing/test_package_docs/fake/VoidCallback.html
index 55c8fecc45..935d1e3a6c 100644
--- a/testing/test_package_docs/fake/VoidCallback.html
+++ b/testing/test_package_docs/fake/VoidCallback.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">typedef VoidCallback</li>
+    <li class="self-crumb">VoidCallback typedef</li>
   </ol>
   <div class="self-name">VoidCallback</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>VoidCallback typedef</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
@@ -139,7 +140,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>typedef VoidCallback</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/WithGetterAndSetter-class.html b/testing/test_package_docs/fake/WithGetterAndSetter-class.html
index 11b543430f..f7caafd4b9 100644
--- a/testing/test_package_docs/fake/WithGetterAndSetter-class.html
+++ b/testing/test_package_docs/fake/WithGetterAndSetter-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">class WithGetterAndSetter</li>
+    <li class="self-crumb">WithGetterAndSetter class</li>
   </ol>
   <div class="self-name">WithGetterAndSetter</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>WithGetterAndSetter class</h1>
 
     <section class="desc markdown">
       <p>Tests a single field with explict getter and setter.</p>
@@ -235,7 +236,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class WithGetterAndSetter</h5>
     <ol>
       <li class="section-title"><a href="fake/WithGetterAndSetter-class.html#constructors">Constructors</a></li>
       <li><a href="fake/WithGetterAndSetter/WithGetterAndSetter.html">WithGetterAndSetter</a></li>
diff --git a/testing/test_package_docs/fake/WithGetterAndSetter/WithGetterAndSetter.html b/testing/test_package_docs/fake/WithGetterAndSetter/WithGetterAndSetter.html
index 67f6e57b30..4f5e16c62a 100644
--- a/testing/test_package_docs/fake/WithGetterAndSetter/WithGetterAndSetter.html
+++ b/testing/test_package_docs/fake/WithGetterAndSetter/WithGetterAndSetter.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
-    <li class="self-crumb">constructor WithGetterAndSetter</li>
+    <li class="self-crumb">WithGetterAndSetter constructor</li>
   </ol>
   <div class="self-name">WithGetterAndSetter</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class WithGetterAndSetter</h5>
+    <h5>WithGetterAndSetter class</h5>
     <ol>
       <li class="section-title"><a href="fake/WithGetterAndSetter-class.html#constructors">Constructors</a></li>
       <li><a href="fake/WithGetterAndSetter/WithGetterAndSetter.html">WithGetterAndSetter</a></li>
@@ -62,6 +62,8 @@ <h5>class WithGetterAndSetter</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>WithGetterAndSetter constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">WithGetterAndSetter</span>(<wbr>)
@@ -73,7 +75,6 @@ <h5>class WithGetterAndSetter</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor WithGetterAndSetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/WithGetterAndSetter/hashCode.html b/testing/test_package_docs/fake/WithGetterAndSetter/hashCode.html
index a226f5b4e2..14a43e4a1e 100644
--- a/testing/test_package_docs/fake/WithGetterAndSetter/hashCode.html
+++ b/testing/test_package_docs/fake/WithGetterAndSetter/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class WithGetterAndSetter</h5>
+    <h5>WithGetterAndSetter class</h5>
     <ol>
       <li class="section-title"><a href="fake/WithGetterAndSetter-class.html#constructors">Constructors</a></li>
       <li><a href="fake/WithGetterAndSetter/WithGetterAndSetter.html">WithGetterAndSetter</a></li>
@@ -62,6 +62,8 @@ <h5>class WithGetterAndSetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class WithGetterAndSetter</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/WithGetterAndSetter/lengthX.html b/testing/test_package_docs/fake/WithGetterAndSetter/lengthX.html
index fdbcd4db97..a478365a69 100644
--- a/testing/test_package_docs/fake/WithGetterAndSetter/lengthX.html
+++ b/testing/test_package_docs/fake/WithGetterAndSetter/lengthX.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
-    <li class="self-crumb">property lengthX</li>
+    <li class="self-crumb">lengthX property</li>
   </ol>
   <div class="self-name">lengthX</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class WithGetterAndSetter</h5>
+    <h5>WithGetterAndSetter class</h5>
     <ol>
       <li class="section-title"><a href="fake/WithGetterAndSetter-class.html#constructors">Constructors</a></li>
       <li><a href="fake/WithGetterAndSetter/WithGetterAndSetter.html">WithGetterAndSetter</a></li>
@@ -62,6 +62,8 @@ <h5>class WithGetterAndSetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>lengthX property</h1>
+
 
         <section id="getter">
         
@@ -94,7 +96,6 @@ <h5>class WithGetterAndSetter</h5>
           </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property lengthX</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/WithGetterAndSetter/noSuchMethod.html b/testing/test_package_docs/fake/WithGetterAndSetter/noSuchMethod.html
index d81ba84e15..e9d416fea4 100644
--- a/testing/test_package_docs/fake/WithGetterAndSetter/noSuchMethod.html
+++ b/testing/test_package_docs/fake/WithGetterAndSetter/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class WithGetterAndSetter</h5>
+    <h5>WithGetterAndSetter class</h5>
     <ol>
       <li class="section-title"><a href="fake/WithGetterAndSetter-class.html#constructors">Constructors</a></li>
       <li><a href="fake/WithGetterAndSetter/WithGetterAndSetter.html">WithGetterAndSetter</a></li>
@@ -62,6 +62,8 @@ <h5>class WithGetterAndSetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -72,7 +74,6 @@ <h5>class WithGetterAndSetter</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/WithGetterAndSetter/operator_equals.html b/testing/test_package_docs/fake/WithGetterAndSetter/operator_equals.html
index b9086927ea..944ec7b2a7 100644
--- a/testing/test_package_docs/fake/WithGetterAndSetter/operator_equals.html
+++ b/testing/test_package_docs/fake/WithGetterAndSetter/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class WithGetterAndSetter</h5>
+    <h5>WithGetterAndSetter class</h5>
     <ol>
       <li class="section-title"><a href="fake/WithGetterAndSetter-class.html#constructors">Constructors</a></li>
       <li><a href="fake/WithGetterAndSetter/WithGetterAndSetter.html">WithGetterAndSetter</a></li>
@@ -62,6 +62,8 @@ <h5>class WithGetterAndSetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -72,7 +74,6 @@ <h5>class WithGetterAndSetter</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/WithGetterAndSetter/runtimeType.html b/testing/test_package_docs/fake/WithGetterAndSetter/runtimeType.html
index 34a7d41eec..eeb308a221 100644
--- a/testing/test_package_docs/fake/WithGetterAndSetter/runtimeType.html
+++ b/testing/test_package_docs/fake/WithGetterAndSetter/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class WithGetterAndSetter</h5>
+    <h5>WithGetterAndSetter class</h5>
     <ol>
       <li class="section-title"><a href="fake/WithGetterAndSetter-class.html#constructors">Constructors</a></li>
       <li><a href="fake/WithGetterAndSetter/WithGetterAndSetter.html">WithGetterAndSetter</a></li>
@@ -62,6 +62,8 @@ <h5>class WithGetterAndSetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -76,7 +78,6 @@ <h5>class WithGetterAndSetter</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/WithGetterAndSetter/toString.html b/testing/test_package_docs/fake/WithGetterAndSetter/toString.html
index 818328fb57..1bdc8af757 100644
--- a/testing/test_package_docs/fake/WithGetterAndSetter/toString.html
+++ b/testing/test_package_docs/fake/WithGetterAndSetter/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class WithGetterAndSetter</h5>
+    <h5>WithGetterAndSetter class</h5>
     <ol>
       <li class="section-title"><a href="fake/WithGetterAndSetter-class.html#constructors">Constructors</a></li>
       <li><a href="fake/WithGetterAndSetter/WithGetterAndSetter.html">WithGetterAndSetter</a></li>
@@ -62,6 +62,8 @@ <h5>class WithGetterAndSetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class WithGetterAndSetter</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/ZERO-constant.html b/testing/test_package_docs/fake/ZERO-constant.html
index 461e4b57f5..3945828ba8 100644
--- a/testing/test_package_docs/fake/ZERO-constant.html
+++ b/testing/test_package_docs/fake/ZERO-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">constant ZERO</li>
+    <li class="self-crumb">ZERO constant</li>
   </ol>
   <div class="self-name">ZERO</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ZERO top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name ">ZERO</span>      =
@@ -144,7 +145,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property ZERO</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/addCallback.html b/testing/test_package_docs/fake/addCallback.html
index 45f932db72..1c8da37ed0 100644
--- a/testing/test_package_docs/fake/addCallback.html
+++ b/testing/test_package_docs/fake/addCallback.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">function addCallback</li>
+    <li class="self-crumb">addCallback function</li>
   </ol>
   <div class="self-name">addCallback</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>addCallback function</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
@@ -142,7 +143,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>function addCallback</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/addCallback2.html b/testing/test_package_docs/fake/addCallback2.html
index 3261a202e8..1f858b572b 100644
--- a/testing/test_package_docs/fake/addCallback2.html
+++ b/testing/test_package_docs/fake/addCallback2.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">function addCallback2</li>
+    <li class="self-crumb">addCallback2 function</li>
   </ol>
   <div class="self-name">addCallback2</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>addCallback2 function</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
@@ -142,7 +143,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>function addCallback2</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/dynamicGetter.html b/testing/test_package_docs/fake/dynamicGetter.html
index e7a0015a39..44cd1345a6 100644
--- a/testing/test_package_docs/fake/dynamicGetter.html
+++ b/testing/test_package_docs/fake/dynamicGetter.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">property dynamicGetter</li>
+    <li class="self-crumb">dynamicGetter property</li>
   </ol>
   <div class="self-name">dynamicGetter</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,8 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>dynamicGetter top-level property</h1>
+
 
     <section id="getter">
     
@@ -145,7 +147,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property dynamicGetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/fake-library.html b/testing/test_package_docs/fake/fake-library.html
index effb752f53..3e4d50a492 100644
--- a/testing/test_package_docs/fake/fake-library.html
+++ b/testing/test_package_docs/fake/fake-library.html
@@ -24,7 +24,7 @@
   <button id="sidenav-left-toggle" type="button">&nbsp;</button>
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
-    <li class="self-crumb">library fake</li>
+    <li class="self-crumb">fake library</li>
   </ol>
   <div class="self-name">fake</div>
   <form class="search navbar-right" role="search">
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>package test_package</h5>
+    <h5>test_package package</h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
@@ -54,6 +54,7 @@ <h5>package test_package</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>fake library</h1>
 
     <section class="desc markdown">
       <h1>WOW FAKE PACKAGE IS <strong>BEST</strong> <a href="http://example.org">PACKAGE</a></h1>
@@ -710,7 +711,7 @@ <h2>Exceptions / Errors</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
diff --git a/testing/test_package_docs/fake/functionWithFunctionParameters.html b/testing/test_package_docs/fake/functionWithFunctionParameters.html
index 5c1c877a31..ef0f657fc7 100644
--- a/testing/test_package_docs/fake/functionWithFunctionParameters.html
+++ b/testing/test_package_docs/fake/functionWithFunctionParameters.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">function functionWithFunctionParameters</li>
+    <li class="self-crumb">functionWithFunctionParameters function</li>
   </ol>
   <div class="self-name">functionWithFunctionParameters</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>functionWithFunctionParameters function</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">String</span>
@@ -143,7 +144,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>function functionWithFunctionParameters</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/getterSetterNodocGetter.html b/testing/test_package_docs/fake/getterSetterNodocGetter.html
index cbdf34cd3d..c2c6363840 100644
--- a/testing/test_package_docs/fake/getterSetterNodocGetter.html
+++ b/testing/test_package_docs/fake/getterSetterNodocGetter.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">property getterSetterNodocGetter</li>
+    <li class="self-crumb">getterSetterNodocGetter property</li>
   </ol>
   <div class="self-name">getterSetterNodocGetter</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,8 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>getterSetterNodocGetter top-level property</h1>
+
 
 
     <section id="setter">
@@ -146,7 +148,6 @@ <h5>library fake</h5>
       </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property getterSetterNodocGetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/getterSetterNodocSetter.html b/testing/test_package_docs/fake/getterSetterNodocSetter.html
index 5c62f144c0..d784b5f75b 100644
--- a/testing/test_package_docs/fake/getterSetterNodocSetter.html
+++ b/testing/test_package_docs/fake/getterSetterNodocSetter.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">property getterSetterNodocSetter</li>
+    <li class="self-crumb">getterSetterNodocSetter property</li>
   </ol>
   <div class="self-name">getterSetterNodocSetter</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,8 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>getterSetterNodocSetter top-level property</h1>
+
 
     <section id="getter">
     
@@ -145,7 +147,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property getterSetterNodocSetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/greatAnnotation-constant.html b/testing/test_package_docs/fake/greatAnnotation-constant.html
index d1c0d7a71a..0d742630bd 100644
--- a/testing/test_package_docs/fake/greatAnnotation-constant.html
+++ b/testing/test_package_docs/fake/greatAnnotation-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">constant greatAnnotation</li>
+    <li class="self-crumb">greatAnnotation constant</li>
   </ol>
   <div class="self-name">greatAnnotation</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>greatAnnotation top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name ">greatAnnotation</span>      =
@@ -143,7 +144,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property greatAnnotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/greatestAnnotation-constant.html b/testing/test_package_docs/fake/greatestAnnotation-constant.html
index 4eeddde95c..dda8de4e6b 100644
--- a/testing/test_package_docs/fake/greatestAnnotation-constant.html
+++ b/testing/test_package_docs/fake/greatestAnnotation-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">constant greatestAnnotation</li>
+    <li class="self-crumb">greatestAnnotation constant</li>
   </ol>
   <div class="self-name">greatestAnnotation</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>greatestAnnotation top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name ">greatestAnnotation</span>      =
@@ -143,7 +144,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property greatestAnnotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/incorrectDocReference-constant.html b/testing/test_package_docs/fake/incorrectDocReference-constant.html
index 0b2bccabe0..961ad38933 100644
--- a/testing/test_package_docs/fake/incorrectDocReference-constant.html
+++ b/testing/test_package_docs/fake/incorrectDocReference-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">constant incorrectDocReference</li>
+    <li class="self-crumb">incorrectDocReference constant</li>
   </ol>
   <div class="self-name">incorrectDocReference</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>incorrectDocReference top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name ">incorrectDocReference</span>      =
@@ -143,7 +144,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property incorrectDocReference</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/justGetter.html b/testing/test_package_docs/fake/justGetter.html
index e7bfee1477..5d35200d2c 100644
--- a/testing/test_package_docs/fake/justGetter.html
+++ b/testing/test_package_docs/fake/justGetter.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">property justGetter</li>
+    <li class="self-crumb">justGetter property</li>
   </ol>
   <div class="self-name">justGetter</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,8 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>justGetter top-level property</h1>
+
 
     <section id="getter">
     
@@ -145,7 +147,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property justGetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/justSetter.html b/testing/test_package_docs/fake/justSetter.html
index 16625547cc..74dd6feb49 100644
--- a/testing/test_package_docs/fake/justSetter.html
+++ b/testing/test_package_docs/fake/justSetter.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">property justSetter</li>
+    <li class="self-crumb">justSetter property</li>
   </ol>
   <div class="self-name">justSetter</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,8 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>justSetter top-level property</h1>
+
 
 
     <section id="setter">
@@ -146,7 +148,6 @@ <h5>library fake</h5>
       </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property justSetter</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/mapWithDynamicKeys.html b/testing/test_package_docs/fake/mapWithDynamicKeys.html
index 63d05ce903..e7203a144a 100644
--- a/testing/test_package_docs/fake/mapWithDynamicKeys.html
+++ b/testing/test_package_docs/fake/mapWithDynamicKeys.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">property mapWithDynamicKeys</li>
+    <li class="self-crumb">mapWithDynamicKeys property</li>
   </ol>
   <div class="self-name">mapWithDynamicKeys</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,8 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>mapWithDynamicKeys top-level property</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">Map<span class="signature">&lt;dynamic, String&gt;</span></span>
       <span class="name ">mapWithDynamicKeys</span>      <div class="features">read / write</div>
@@ -138,7 +140,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property mapWithDynamicKeys</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/meaningOfLife.html b/testing/test_package_docs/fake/meaningOfLife.html
index 9b0c0c9987..486a4a4b3e 100644
--- a/testing/test_package_docs/fake/meaningOfLife.html
+++ b/testing/test_package_docs/fake/meaningOfLife.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">property <span class="deprecated">meaningOfLife</span></li>
+    <li class="self-crumb"><span class="deprecated">meaningOfLife</span> property</li>
   </ol>
   <div class="self-name">meaningOfLife</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,8 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>meaningOfLife top-level property</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">int</span>
       <span class="name deprecated">meaningOfLife</span>      <div class="features">final</div>
@@ -141,7 +143,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property meaningOfLife</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/myCoolTypedef.html b/testing/test_package_docs/fake/myCoolTypedef.html
index f190443134..5d0ec3b8d2 100644
--- a/testing/test_package_docs/fake/myCoolTypedef.html
+++ b/testing/test_package_docs/fake/myCoolTypedef.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">typedef myCoolTypedef</li>
+    <li class="self-crumb">myCoolTypedef typedef</li>
   </ol>
   <div class="self-name">myCoolTypedef</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>myCoolTypedef typedef</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
@@ -139,7 +140,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>typedef myCoolTypedef</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/myGenericFunction.html b/testing/test_package_docs/fake/myGenericFunction.html
index cc522b3444..bf6de22008 100644
--- a/testing/test_package_docs/fake/myGenericFunction.html
+++ b/testing/test_package_docs/fake/myGenericFunction.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">function myGenericFunction&lt;S&gt;</li>
+    <li class="self-crumb">myGenericFunction&lt;S&gt; function</li>
   </ol>
   <div class="self-name">myGenericFunction</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>myGenericFunction&lt;S&gt; function</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
@@ -142,7 +143,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>function myGenericFunction</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/onlyPositionalWithNoDefaultNoType.html b/testing/test_package_docs/fake/onlyPositionalWithNoDefaultNoType.html
index a30da45523..0084452103 100644
--- a/testing/test_package_docs/fake/onlyPositionalWithNoDefaultNoType.html
+++ b/testing/test_package_docs/fake/onlyPositionalWithNoDefaultNoType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">function onlyPositionalWithNoDefaultNoType</li>
+    <li class="self-crumb">onlyPositionalWithNoDefaultNoType function</li>
   </ol>
   <div class="self-name">onlyPositionalWithNoDefaultNoType</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>onlyPositionalWithNoDefaultNoType function</h1>
 
     <section class="multi-line-signature">
         <div>
@@ -147,7 +148,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>function onlyPositionalWithNoDefaultNoType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/paintImage1.html b/testing/test_package_docs/fake/paintImage1.html
index 3422608438..5348087435 100644
--- a/testing/test_package_docs/fake/paintImage1.html
+++ b/testing/test_package_docs/fake/paintImage1.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">function paintImage1</li>
+    <li class="self-crumb">paintImage1 function</li>
   </ol>
   <div class="self-name">paintImage1</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>paintImage1 function</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
@@ -142,7 +143,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>function paintImage1</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/paintImage2.html b/testing/test_package_docs/fake/paintImage2.html
index 94bc107031..18532b02ee 100644
--- a/testing/test_package_docs/fake/paintImage2.html
+++ b/testing/test_package_docs/fake/paintImage2.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">function paintImage2</li>
+    <li class="self-crumb">paintImage2 function</li>
   </ol>
   <div class="self-name">paintImage2</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>paintImage2 function</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
@@ -142,7 +143,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>function paintImage2</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/paramFromAnotherLib.html b/testing/test_package_docs/fake/paramFromAnotherLib.html
index f6f9d5a395..a27da405b4 100644
--- a/testing/test_package_docs/fake/paramFromAnotherLib.html
+++ b/testing/test_package_docs/fake/paramFromAnotherLib.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">function paramFromAnotherLib</li>
+    <li class="self-crumb">paramFromAnotherLib function</li>
   </ol>
   <div class="self-name">paramFromAnotherLib</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>paramFromAnotherLib function</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
@@ -142,7 +143,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>function paramFromAnotherLib</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/required-constant.html b/testing/test_package_docs/fake/required-constant.html
index 13980e9832..e864200cdb 100644
--- a/testing/test_package_docs/fake/required-constant.html
+++ b/testing/test_package_docs/fake/required-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">constant required</li>
+    <li class="self-crumb">required constant</li>
   </ol>
   <div class="self-name">required</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>required top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name ">required</span>      =
@@ -140,7 +141,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property required</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/setAndGet.html b/testing/test_package_docs/fake/setAndGet.html
index 3f12df362e..20fef20f1f 100644
--- a/testing/test_package_docs/fake/setAndGet.html
+++ b/testing/test_package_docs/fake/setAndGet.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">property setAndGet</li>
+    <li class="self-crumb">setAndGet property</li>
   </ol>
   <div class="self-name">setAndGet</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,8 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>setAndGet top-level property</h1>
+
 
     <section id="getter">
     
@@ -158,7 +160,6 @@ <h5>library fake</h5>
       </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property setAndGet</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/short.html b/testing/test_package_docs/fake/short.html
index 02314df160..e83d8af6d9 100644
--- a/testing/test_package_docs/fake/short.html
+++ b/testing/test_package_docs/fake/short.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">function short</li>
+    <li class="self-crumb">short function</li>
   </ol>
   <div class="self-name">short</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>short function</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
@@ -143,7 +144,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>function short</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/simpleProperty.html b/testing/test_package_docs/fake/simpleProperty.html
index 27da6ba02b..5addccf4a6 100644
--- a/testing/test_package_docs/fake/simpleProperty.html
+++ b/testing/test_package_docs/fake/simpleProperty.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">property simpleProperty</li>
+    <li class="self-crumb">simpleProperty property</li>
   </ol>
   <div class="self-name">simpleProperty</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,8 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>simpleProperty top-level property</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">simpleProperty</span>      <div class="features">read / write</div>
@@ -141,7 +143,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property simpleProperty</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/soIntense.html b/testing/test_package_docs/fake/soIntense.html
index 2f8916a09c..ea1cc8a45b 100644
--- a/testing/test_package_docs/fake/soIntense.html
+++ b/testing/test_package_docs/fake/soIntense.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">function soIntense</li>
+    <li class="self-crumb">soIntense function</li>
   </ol>
   <div class="self-name">soIntense</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>soIntense function</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
@@ -143,7 +144,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>function soIntense</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html b/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html
index fc25e429d4..a5861f7126 100644
--- a/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html
+++ b/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">constant testingCodeSyntaxInOneLiners</li>
+    <li class="self-crumb">testingCodeSyntaxInOneLiners constant</li>
   </ol>
   <div class="self-name">testingCodeSyntaxInOneLiners</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>testingCodeSyntaxInOneLiners top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="name ">testingCodeSyntaxInOneLiners</span>      =
@@ -143,7 +144,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property testingCodeSyntaxInOneLiners</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/thisIsAlsoAsync.html b/testing/test_package_docs/fake/thisIsAlsoAsync.html
index ef96771314..8ea93cc9d7 100644
--- a/testing/test_package_docs/fake/thisIsAlsoAsync.html
+++ b/testing/test_package_docs/fake/thisIsAlsoAsync.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">function thisIsAlsoAsync</li>
+    <li class="self-crumb">thisIsAlsoAsync function</li>
   </ol>
   <div class="self-name">thisIsAlsoAsync</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>thisIsAlsoAsync function</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">Future</span>
@@ -142,7 +143,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>function thisIsAlsoAsync</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/thisIsAsync.html b/testing/test_package_docs/fake/thisIsAsync.html
index 9c39f271ca..416f898e35 100644
--- a/testing/test_package_docs/fake/thisIsAsync.html
+++ b/testing/test_package_docs/fake/thisIsAsync.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">function thisIsAsync</li>
+    <li class="self-crumb">thisIsAsync function</li>
   </ol>
   <div class="self-name">thisIsAsync</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>thisIsAsync function</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">Future</span>
@@ -142,7 +143,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>function thisIsAsync</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/fake/topLevelFunction.html b/testing/test_package_docs/fake/topLevelFunction.html
index 2febd3c97d..0e0b032851 100644
--- a/testing/test_package_docs/fake/topLevelFunction.html
+++ b/testing/test_package_docs/fake/topLevelFunction.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">function <span class="deprecated">topLevelFunction</span></li>
+    <li class="self-crumb"><span class="deprecated">topLevelFunction</span> function</li>
   </ol>
   <div class="self-name">topLevelFunction</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library fake</h5>
+    <h5>fake library</h5>
     <ol>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
@@ -128,6 +128,7 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>topLevelFunction function</h1>
 
     <section class="multi-line-signature">
         <div>
@@ -157,7 +158,6 @@ <h5>library fake</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>function topLevelFunction</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/index.html b/testing/test_package_docs/index.html
index 9bbf946fae..21eda2595d 100644
--- a/testing/test_package_docs/index.html
+++ b/testing/test_package_docs/index.html
@@ -21,7 +21,7 @@
 
 <header id="title">
   <ol class="breadcrumbs gt-separated dark hidden-xs">
-    <li><a href="http://github.com/dart-lang">package test_package</a></li>
+    <li><a href="http://github.com/dart-lang">test_package package</a></li>
   </ol>
   <div class="self-name">test_package</div>
   <form class="search navbar-right" role="search">
@@ -32,7 +32,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>package test_package</h5>
+    <h5>test_package package</h5>
 
 
     <ol>
diff --git a/testing/test_package_docs/is_deprecated/is_deprecated-library.html b/testing/test_package_docs/is_deprecated/is_deprecated-library.html
index ec20101418..da7869b1bb 100644
--- a/testing/test_package_docs/is_deprecated/is_deprecated-library.html
+++ b/testing/test_package_docs/is_deprecated/is_deprecated-library.html
@@ -24,7 +24,7 @@
   <button id="sidenav-left-toggle" type="button">&nbsp;</button>
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
-    <li class="self-crumb">library <span class="deprecated">is_deprecated</span></li>
+    <li class="self-crumb"><span class="deprecated">is_deprecated</span> library</li>
   </ol>
   <div class="self-name">is_deprecated</div>
   <form class="search navbar-right" role="search">
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>package test_package</h5>
+    <h5>test_package package</h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
@@ -54,6 +54,7 @@ <h5>package test_package</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>is_deprecated library</h1>
 
     <section class="desc markdown">
       <p>This lib is deprecated. It never had a chance</p>
@@ -69,7 +70,7 @@ <h5>package test_package</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>library is_deprecated</h5>
+    <h5>is_deprecated library</h5>
     <ol>
     
     
diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass-class.html b/testing/test_package_docs/reexport_one/SomeOtherClass-class.html
index a78b65c1c0..9b1cc3ae98 100644
--- a/testing/test_package_docs/reexport_one/SomeOtherClass-class.html
+++ b/testing/test_package_docs/reexport_one/SomeOtherClass-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
-    <li class="self-crumb">class SomeOtherClass</li>
+    <li class="self-crumb">SomeOtherClass class</li>
   </ol>
   <div class="self-name">SomeOtherClass</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library reexport_one</h5>
+    <h5>reexport_one library</h5>
     <ol>
       <li class="section-title"><a href="reexport_one/reexport_one-library.html#classes">Classes</a></li>
       <li><a href="reexport_two/AUnicornClass-class.html">AUnicornClass</a></li>
@@ -53,6 +53,7 @@ <h5>library reexport_one</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>SomeOtherClass class</h1>
 
     
 
@@ -137,7 +138,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class SomeOtherClass</h5>
     <ol>
       <li class="section-title"><a href="reexport_one/SomeOtherClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_one/SomeOtherClass/SomeOtherClass.html">SomeOtherClass</a></li>
diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/SomeOtherClass.html b/testing/test_package_docs/reexport_one/SomeOtherClass/SomeOtherClass.html
index deb43ba095..506ee93d2e 100644
--- a/testing/test_package_docs/reexport_one/SomeOtherClass/SomeOtherClass.html
+++ b/testing/test_package_docs/reexport_one/SomeOtherClass/SomeOtherClass.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
     <li><a href="reexport_one/SomeOtherClass-class.html">SomeOtherClass</a></li>
-    <li class="self-crumb">constructor SomeOtherClass</li>
+    <li class="self-crumb">SomeOtherClass constructor</li>
   </ol>
   <div class="self-name">SomeOtherClass</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SomeOtherClass</h5>
+    <h5>SomeOtherClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_one/SomeOtherClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_one/SomeOtherClass/SomeOtherClass.html">SomeOtherClass</a></li>
@@ -61,6 +61,8 @@ <h5>class SomeOtherClass</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>SomeOtherClass constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">SomeOtherClass</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class SomeOtherClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor SomeOtherClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/hashCode.html b/testing/test_package_docs/reexport_one/SomeOtherClass/hashCode.html
index e7c1bf91ce..92f99f9774 100644
--- a/testing/test_package_docs/reexport_one/SomeOtherClass/hashCode.html
+++ b/testing/test_package_docs/reexport_one/SomeOtherClass/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
     <li><a href="reexport_one/SomeOtherClass-class.html">SomeOtherClass</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SomeOtherClass</h5>
+    <h5>SomeOtherClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_one/SomeOtherClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_one/SomeOtherClass/SomeOtherClass.html">SomeOtherClass</a></li>
@@ -61,6 +61,8 @@ <h5>class SomeOtherClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class SomeOtherClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/noSuchMethod.html b/testing/test_package_docs/reexport_one/SomeOtherClass/noSuchMethod.html
index 0a3ff0d699..0f3a721b9d 100644
--- a/testing/test_package_docs/reexport_one/SomeOtherClass/noSuchMethod.html
+++ b/testing/test_package_docs/reexport_one/SomeOtherClass/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
     <li><a href="reexport_one/SomeOtherClass-class.html">SomeOtherClass</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SomeOtherClass</h5>
+    <h5>SomeOtherClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_one/SomeOtherClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_one/SomeOtherClass/SomeOtherClass.html">SomeOtherClass</a></li>
@@ -61,6 +61,8 @@ <h5>class SomeOtherClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -71,7 +73,6 @@ <h5>class SomeOtherClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/operator_equals.html b/testing/test_package_docs/reexport_one/SomeOtherClass/operator_equals.html
index 1a872bfdb1..d0993a506c 100644
--- a/testing/test_package_docs/reexport_one/SomeOtherClass/operator_equals.html
+++ b/testing/test_package_docs/reexport_one/SomeOtherClass/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
     <li><a href="reexport_one/SomeOtherClass-class.html">SomeOtherClass</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SomeOtherClass</h5>
+    <h5>SomeOtherClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_one/SomeOtherClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_one/SomeOtherClass/SomeOtherClass.html">SomeOtherClass</a></li>
@@ -61,6 +61,8 @@ <h5>class SomeOtherClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -71,7 +73,6 @@ <h5>class SomeOtherClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/runtimeType.html b/testing/test_package_docs/reexport_one/SomeOtherClass/runtimeType.html
index ed781e7341..387c11ab23 100644
--- a/testing/test_package_docs/reexport_one/SomeOtherClass/runtimeType.html
+++ b/testing/test_package_docs/reexport_one/SomeOtherClass/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
     <li><a href="reexport_one/SomeOtherClass-class.html">SomeOtherClass</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SomeOtherClass</h5>
+    <h5>SomeOtherClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_one/SomeOtherClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_one/SomeOtherClass/SomeOtherClass.html">SomeOtherClass</a></li>
@@ -61,6 +61,8 @@ <h5>class SomeOtherClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class SomeOtherClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/toString.html b/testing/test_package_docs/reexport_one/SomeOtherClass/toString.html
index a7d3ec5514..941e655c21 100644
--- a/testing/test_package_docs/reexport_one/SomeOtherClass/toString.html
+++ b/testing/test_package_docs/reexport_one/SomeOtherClass/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
     <li><a href="reexport_one/SomeOtherClass-class.html">SomeOtherClass</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SomeOtherClass</h5>
+    <h5>SomeOtherClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_one/SomeOtherClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_one/SomeOtherClass/SomeOtherClass.html">SomeOtherClass</a></li>
@@ -61,6 +61,8 @@ <h5>class SomeOtherClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -71,7 +73,6 @@ <h5>class SomeOtherClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_one/reexport_one-library.html b/testing/test_package_docs/reexport_one/reexport_one-library.html
index efa638d0da..d51243eb3c 100644
--- a/testing/test_package_docs/reexport_one/reexport_one-library.html
+++ b/testing/test_package_docs/reexport_one/reexport_one-library.html
@@ -24,7 +24,7 @@
   <button id="sidenav-left-toggle" type="button">&nbsp;</button>
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
-    <li class="self-crumb">library reexport_one</li>
+    <li class="self-crumb">reexport_one library</li>
   </ol>
   <div class="self-name">reexport_one</div>
   <form class="search navbar-right" role="search">
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>package test_package</h5>
+    <h5>test_package package</h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
@@ -54,6 +54,7 @@ <h5>package test_package</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>reexport_one library</h1>
 
     <section class="desc markdown">
       
@@ -99,7 +100,7 @@ <h2>Classes</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>library reexport_one</h5>
+    <h5>reexport_one library</h5>
     <ol>
       <li class="section-title"><a href="reexport_one/reexport_one-library.html#classes">Classes</a></li>
       <li><a href="reexport_two/AUnicornClass-class.html">AUnicornClass</a></li>
diff --git a/testing/test_package_docs/reexport_two/AUnicornClass-class.html b/testing/test_package_docs/reexport_two/AUnicornClass-class.html
index d60b57e204..d72aae14a8 100644
--- a/testing/test_package_docs/reexport_two/AUnicornClass-class.html
+++ b/testing/test_package_docs/reexport_two/AUnicornClass-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
-    <li class="self-crumb">class AUnicornClass</li>
+    <li class="self-crumb">AUnicornClass class</li>
   </ol>
   <div class="self-name">AUnicornClass</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library reexport_two</h5>
+    <h5>reexport_two library</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/reexport_two-library.html#classes">Classes</a></li>
       <li><a href="reexport_two/AUnicornClass-class.html">AUnicornClass</a></li>
@@ -53,6 +53,7 @@ <h5>library reexport_two</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>AUnicornClass class</h1>
 
     
 
@@ -137,7 +138,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class AUnicornClass</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/AUnicornClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/AUnicornClass/AUnicornClass.html">AUnicornClass</a></li>
diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/AUnicornClass.html b/testing/test_package_docs/reexport_two/AUnicornClass/AUnicornClass.html
index 49f7c37666..239116d664 100644
--- a/testing/test_package_docs/reexport_two/AUnicornClass/AUnicornClass.html
+++ b/testing/test_package_docs/reexport_two/AUnicornClass/AUnicornClass.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
     <li><a href="reexport_two/AUnicornClass-class.html">AUnicornClass</a></li>
-    <li class="self-crumb">constructor AUnicornClass</li>
+    <li class="self-crumb">AUnicornClass constructor</li>
   </ol>
   <div class="self-name">AUnicornClass</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AUnicornClass</h5>
+    <h5>AUnicornClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/AUnicornClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/AUnicornClass/AUnicornClass.html">AUnicornClass</a></li>
@@ -61,6 +61,8 @@ <h5>class AUnicornClass</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>AUnicornClass constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">AUnicornClass</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class AUnicornClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor AUnicornClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/hashCode.html b/testing/test_package_docs/reexport_two/AUnicornClass/hashCode.html
index 56400a2f65..8d8348a457 100644
--- a/testing/test_package_docs/reexport_two/AUnicornClass/hashCode.html
+++ b/testing/test_package_docs/reexport_two/AUnicornClass/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
     <li><a href="reexport_two/AUnicornClass-class.html">AUnicornClass</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AUnicornClass</h5>
+    <h5>AUnicornClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/AUnicornClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/AUnicornClass/AUnicornClass.html">AUnicornClass</a></li>
@@ -61,6 +61,8 @@ <h5>class AUnicornClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class AUnicornClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/noSuchMethod.html b/testing/test_package_docs/reexport_two/AUnicornClass/noSuchMethod.html
index f82bbf1f5a..e76d3efe7e 100644
--- a/testing/test_package_docs/reexport_two/AUnicornClass/noSuchMethod.html
+++ b/testing/test_package_docs/reexport_two/AUnicornClass/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
     <li><a href="reexport_two/AUnicornClass-class.html">AUnicornClass</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AUnicornClass</h5>
+    <h5>AUnicornClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/AUnicornClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/AUnicornClass/AUnicornClass.html">AUnicornClass</a></li>
@@ -61,6 +61,8 @@ <h5>class AUnicornClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -71,7 +73,6 @@ <h5>class AUnicornClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/operator_equals.html b/testing/test_package_docs/reexport_two/AUnicornClass/operator_equals.html
index 6927993f70..a13202ef2e 100644
--- a/testing/test_package_docs/reexport_two/AUnicornClass/operator_equals.html
+++ b/testing/test_package_docs/reexport_two/AUnicornClass/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
     <li><a href="reexport_two/AUnicornClass-class.html">AUnicornClass</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AUnicornClass</h5>
+    <h5>AUnicornClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/AUnicornClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/AUnicornClass/AUnicornClass.html">AUnicornClass</a></li>
@@ -61,6 +61,8 @@ <h5>class AUnicornClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -71,7 +73,6 @@ <h5>class AUnicornClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/runtimeType.html b/testing/test_package_docs/reexport_two/AUnicornClass/runtimeType.html
index 65bcbb5c34..e22469f78c 100644
--- a/testing/test_package_docs/reexport_two/AUnicornClass/runtimeType.html
+++ b/testing/test_package_docs/reexport_two/AUnicornClass/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
     <li><a href="reexport_two/AUnicornClass-class.html">AUnicornClass</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AUnicornClass</h5>
+    <h5>AUnicornClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/AUnicornClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/AUnicornClass/AUnicornClass.html">AUnicornClass</a></li>
@@ -61,6 +61,8 @@ <h5>class AUnicornClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class AUnicornClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/toString.html b/testing/test_package_docs/reexport_two/AUnicornClass/toString.html
index f25c0415af..43de44a35c 100644
--- a/testing/test_package_docs/reexport_two/AUnicornClass/toString.html
+++ b/testing/test_package_docs/reexport_two/AUnicornClass/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
     <li><a href="reexport_two/AUnicornClass-class.html">AUnicornClass</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class AUnicornClass</h5>
+    <h5>AUnicornClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/AUnicornClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/AUnicornClass/AUnicornClass.html">AUnicornClass</a></li>
@@ -61,6 +61,8 @@ <h5>class AUnicornClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -71,7 +73,6 @@ <h5>class AUnicornClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_two/SomeClass-class.html b/testing/test_package_docs/reexport_two/SomeClass-class.html
index cfbed2c34e..79339e5f9e 100644
--- a/testing/test_package_docs/reexport_two/SomeClass-class.html
+++ b/testing/test_package_docs/reexport_two/SomeClass-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
-    <li class="self-crumb">class SomeClass</li>
+    <li class="self-crumb">SomeClass class</li>
   </ol>
   <div class="self-name">SomeClass</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library reexport_two</h5>
+    <h5>reexport_two library</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/reexport_two-library.html#classes">Classes</a></li>
       <li><a href="reexport_two/AUnicornClass-class.html">AUnicornClass</a></li>
@@ -53,6 +53,7 @@ <h5>library reexport_two</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>SomeClass class</h1>
 
     
 
@@ -137,7 +138,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class SomeClass</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/SomeClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/SomeClass/SomeClass.html">SomeClass</a></li>
diff --git a/testing/test_package_docs/reexport_two/SomeClass/SomeClass.html b/testing/test_package_docs/reexport_two/SomeClass/SomeClass.html
index f1a7c198cb..5d8e4e595d 100644
--- a/testing/test_package_docs/reexport_two/SomeClass/SomeClass.html
+++ b/testing/test_package_docs/reexport_two/SomeClass/SomeClass.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
     <li><a href="reexport_two/SomeClass-class.html">SomeClass</a></li>
-    <li class="self-crumb">constructor SomeClass</li>
+    <li class="self-crumb">SomeClass constructor</li>
   </ol>
   <div class="self-name">SomeClass</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SomeClass</h5>
+    <h5>SomeClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/SomeClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/SomeClass/SomeClass.html">SomeClass</a></li>
@@ -61,6 +61,8 @@ <h5>class SomeClass</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>SomeClass constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">SomeClass</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class SomeClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor SomeClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_two/SomeClass/hashCode.html b/testing/test_package_docs/reexport_two/SomeClass/hashCode.html
index f0d85fd882..e6c81b20cf 100644
--- a/testing/test_package_docs/reexport_two/SomeClass/hashCode.html
+++ b/testing/test_package_docs/reexport_two/SomeClass/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
     <li><a href="reexport_two/SomeClass-class.html">SomeClass</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SomeClass</h5>
+    <h5>SomeClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/SomeClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/SomeClass/SomeClass.html">SomeClass</a></li>
@@ -61,6 +61,8 @@ <h5>class SomeClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class SomeClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_two/SomeClass/noSuchMethod.html b/testing/test_package_docs/reexport_two/SomeClass/noSuchMethod.html
index e606f1c7fe..160a2f4c8f 100644
--- a/testing/test_package_docs/reexport_two/SomeClass/noSuchMethod.html
+++ b/testing/test_package_docs/reexport_two/SomeClass/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
     <li><a href="reexport_two/SomeClass-class.html">SomeClass</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SomeClass</h5>
+    <h5>SomeClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/SomeClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/SomeClass/SomeClass.html">SomeClass</a></li>
@@ -61,6 +61,8 @@ <h5>class SomeClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -71,7 +73,6 @@ <h5>class SomeClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_two/SomeClass/operator_equals.html b/testing/test_package_docs/reexport_two/SomeClass/operator_equals.html
index 1b43f2213e..cd00de069c 100644
--- a/testing/test_package_docs/reexport_two/SomeClass/operator_equals.html
+++ b/testing/test_package_docs/reexport_two/SomeClass/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
     <li><a href="reexport_two/SomeClass-class.html">SomeClass</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SomeClass</h5>
+    <h5>SomeClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/SomeClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/SomeClass/SomeClass.html">SomeClass</a></li>
@@ -61,6 +61,8 @@ <h5>class SomeClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -71,7 +73,6 @@ <h5>class SomeClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_two/SomeClass/runtimeType.html b/testing/test_package_docs/reexport_two/SomeClass/runtimeType.html
index 9a57b20099..6c13112335 100644
--- a/testing/test_package_docs/reexport_two/SomeClass/runtimeType.html
+++ b/testing/test_package_docs/reexport_two/SomeClass/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
     <li><a href="reexport_two/SomeClass-class.html">SomeClass</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SomeClass</h5>
+    <h5>SomeClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/SomeClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/SomeClass/SomeClass.html">SomeClass</a></li>
@@ -61,6 +61,8 @@ <h5>class SomeClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class SomeClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_two/SomeClass/toString.html b/testing/test_package_docs/reexport_two/SomeClass/toString.html
index c56cf3d69d..678546521c 100644
--- a/testing/test_package_docs/reexport_two/SomeClass/toString.html
+++ b/testing/test_package_docs/reexport_two/SomeClass/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
     <li><a href="reexport_two/SomeClass-class.html">SomeClass</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class SomeClass</h5>
+    <h5>SomeClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/SomeClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/SomeClass/SomeClass.html">SomeClass</a></li>
@@ -61,6 +61,8 @@ <h5>class SomeClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -71,7 +73,6 @@ <h5>class SomeClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass-class.html b/testing/test_package_docs/reexport_two/YetAnotherClass-class.html
index a5c33f5f9e..f2c9c8a95c 100644
--- a/testing/test_package_docs/reexport_two/YetAnotherClass-class.html
+++ b/testing/test_package_docs/reexport_two/YetAnotherClass-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
-    <li class="self-crumb">class YetAnotherClass</li>
+    <li class="self-crumb">YetAnotherClass class</li>
   </ol>
   <div class="self-name">YetAnotherClass</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library reexport_two</h5>
+    <h5>reexport_two library</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/reexport_two-library.html#classes">Classes</a></li>
       <li><a href="reexport_two/AUnicornClass-class.html">AUnicornClass</a></li>
@@ -53,6 +53,7 @@ <h5>library reexport_two</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>YetAnotherClass class</h1>
 
     
 
@@ -137,7 +138,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class YetAnotherClass</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/YetAnotherClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/YetAnotherClass/YetAnotherClass.html">YetAnotherClass</a></li>
diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/YetAnotherClass.html b/testing/test_package_docs/reexport_two/YetAnotherClass/YetAnotherClass.html
index 5c6b91f087..d706a2f70b 100644
--- a/testing/test_package_docs/reexport_two/YetAnotherClass/YetAnotherClass.html
+++ b/testing/test_package_docs/reexport_two/YetAnotherClass/YetAnotherClass.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
     <li><a href="reexport_two/YetAnotherClass-class.html">YetAnotherClass</a></li>
-    <li class="self-crumb">constructor YetAnotherClass</li>
+    <li class="self-crumb">YetAnotherClass constructor</li>
   </ol>
   <div class="self-name">YetAnotherClass</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class YetAnotherClass</h5>
+    <h5>YetAnotherClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/YetAnotherClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/YetAnotherClass/YetAnotherClass.html">YetAnotherClass</a></li>
@@ -61,6 +61,8 @@ <h5>class YetAnotherClass</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>YetAnotherClass constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">YetAnotherClass</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class YetAnotherClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor YetAnotherClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/hashCode.html b/testing/test_package_docs/reexport_two/YetAnotherClass/hashCode.html
index c4a876ac4d..51d18e8bed 100644
--- a/testing/test_package_docs/reexport_two/YetAnotherClass/hashCode.html
+++ b/testing/test_package_docs/reexport_two/YetAnotherClass/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
     <li><a href="reexport_two/YetAnotherClass-class.html">YetAnotherClass</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class YetAnotherClass</h5>
+    <h5>YetAnotherClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/YetAnotherClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/YetAnotherClass/YetAnotherClass.html">YetAnotherClass</a></li>
@@ -61,6 +61,8 @@ <h5>class YetAnotherClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class YetAnotherClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/noSuchMethod.html b/testing/test_package_docs/reexport_two/YetAnotherClass/noSuchMethod.html
index 2a54342ff2..ffcf98eb40 100644
--- a/testing/test_package_docs/reexport_two/YetAnotherClass/noSuchMethod.html
+++ b/testing/test_package_docs/reexport_two/YetAnotherClass/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
     <li><a href="reexport_two/YetAnotherClass-class.html">YetAnotherClass</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class YetAnotherClass</h5>
+    <h5>YetAnotherClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/YetAnotherClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/YetAnotherClass/YetAnotherClass.html">YetAnotherClass</a></li>
@@ -61,6 +61,8 @@ <h5>class YetAnotherClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -71,7 +73,6 @@ <h5>class YetAnotherClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/operator_equals.html b/testing/test_package_docs/reexport_two/YetAnotherClass/operator_equals.html
index 0e59578272..2672ab4305 100644
--- a/testing/test_package_docs/reexport_two/YetAnotherClass/operator_equals.html
+++ b/testing/test_package_docs/reexport_two/YetAnotherClass/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
     <li><a href="reexport_two/YetAnotherClass-class.html">YetAnotherClass</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class YetAnotherClass</h5>
+    <h5>YetAnotherClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/YetAnotherClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/YetAnotherClass/YetAnotherClass.html">YetAnotherClass</a></li>
@@ -61,6 +61,8 @@ <h5>class YetAnotherClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -71,7 +73,6 @@ <h5>class YetAnotherClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/runtimeType.html b/testing/test_package_docs/reexport_two/YetAnotherClass/runtimeType.html
index 074b480616..65915ebd39 100644
--- a/testing/test_package_docs/reexport_two/YetAnotherClass/runtimeType.html
+++ b/testing/test_package_docs/reexport_two/YetAnotherClass/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
     <li><a href="reexport_two/YetAnotherClass-class.html">YetAnotherClass</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class YetAnotherClass</h5>
+    <h5>YetAnotherClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/YetAnotherClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/YetAnotherClass/YetAnotherClass.html">YetAnotherClass</a></li>
@@ -61,6 +61,8 @@ <h5>class YetAnotherClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class YetAnotherClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/toString.html b/testing/test_package_docs/reexport_two/YetAnotherClass/toString.html
index 75360c0a7d..e691264cbf 100644
--- a/testing/test_package_docs/reexport_two/YetAnotherClass/toString.html
+++ b/testing/test_package_docs/reexport_two/YetAnotherClass/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
     <li><a href="reexport_two/YetAnotherClass-class.html">YetAnotherClass</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class YetAnotherClass</h5>
+    <h5>YetAnotherClass class</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/YetAnotherClass-class.html#constructors">Constructors</a></li>
       <li><a href="reexport_two/YetAnotherClass/YetAnotherClass.html">YetAnotherClass</a></li>
@@ -61,6 +61,8 @@ <h5>class YetAnotherClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -71,7 +73,6 @@ <h5>class YetAnotherClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/reexport_two/reexport_two-library.html b/testing/test_package_docs/reexport_two/reexport_two-library.html
index e53a5ce701..f8cf3293bb 100644
--- a/testing/test_package_docs/reexport_two/reexport_two-library.html
+++ b/testing/test_package_docs/reexport_two/reexport_two-library.html
@@ -24,7 +24,7 @@
   <button id="sidenav-left-toggle" type="button">&nbsp;</button>
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
-    <li class="self-crumb">library reexport_two</li>
+    <li class="self-crumb">reexport_two library</li>
   </ol>
   <div class="self-name">reexport_two</div>
   <form class="search navbar-right" role="search">
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>package test_package</h5>
+    <h5>test_package package</h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
@@ -54,6 +54,7 @@ <h5>package test_package</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>reexport_two library</h1>
 
     <section class="desc markdown">
       
@@ -99,7 +100,7 @@ <h2>Classes</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>library reexport_two</h5>
+    <h5>reexport_two library</h5>
     <ol>
       <li class="section-title"><a href="reexport_two/reexport_two-library.html#classes">Classes</a></li>
       <li><a href="reexport_two/AUnicornClass-class.html">AUnicornClass</a></li>
diff --git a/testing/test_package_docs/static-assets/styles.css b/testing/test_package_docs/static-assets/styles.css
index aa1cf21151..b2280457e4 100644
--- a/testing/test_package_docs/static-assets/styles.css
+++ b/testing/test_package_docs/static-assets/styles.css
@@ -599,6 +599,7 @@ ul.subnav li:last-of-type {
 .sidebar ol {
   list-style: none;
   line-height: 22px;
+  margin-top: 0;
   margin-bottom: 0;
   padding: 0 0 15px 0;
 }
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass-class.html b/testing/test_package_docs/test_package_imported.main/Whataclass-class.html
index cf7239cfb2..134f2506dd 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass-class.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
-    <li class="self-crumb">class Whataclass<span class="signature">&lt;T&gt;</span></li>
+    <li class="self-crumb">Whataclass<span class="signature">&lt;T&gt;</span> class</li>
   </ol>
   <div class="self-name">Whataclass</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library test_package_imported.main</h5>
+    <h5>test_package_imported.main library</h5>
     <ol>
       <li class="section-title"><a href="test_package_imported.main/test_package_imported.main-library.html#classes">Classes</a></li>
       <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a></li>
@@ -51,6 +51,7 @@ <h5>library test_package_imported.main</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Whataclass&lt;T&gt; class</h1>
 
     <section class="desc markdown">
       <p>Some docs for whataclass</p>
@@ -138,7 +139,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class Whataclass</h5>
     <ol>
       <li class="section-title"><a href="test_package_imported.main/Whataclass-class.html#constructors">Constructors</a></li>
       <li><a href="test_package_imported.main/Whataclass/Whataclass.html">Whataclass</a></li>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass/Whataclass.html b/testing/test_package_docs/test_package_imported.main/Whataclass/Whataclass.html
index a8552bf8e2..4b45b433be 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass/Whataclass.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass/Whataclass.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">constructor Whataclass</li>
+    <li class="self-crumb">Whataclass constructor</li>
   </ol>
   <div class="self-name">Whataclass</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Whataclass</h5>
+    <h5>Whataclass class</h5>
     <ol>
       <li class="section-title"><a href="test_package_imported.main/Whataclass-class.html#constructors">Constructors</a></li>
       <li><a href="test_package_imported.main/Whataclass/Whataclass.html">Whataclass</a></li>
@@ -61,6 +61,8 @@ <h5>class Whataclass</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Whataclass&lt;T&gt; constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">Whataclass&lt;T&gt;</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class Whataclass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor Whataclass</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass/hashCode.html b/testing/test_package_docs/test_package_imported.main/Whataclass/hashCode.html
index 67cda4ed64..150aa02b2e 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass/hashCode.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Whataclass</h5>
+    <h5>Whataclass class</h5>
     <ol>
       <li class="section-title"><a href="test_package_imported.main/Whataclass-class.html#constructors">Constructors</a></li>
       <li><a href="test_package_imported.main/Whataclass/Whataclass.html">Whataclass</a></li>
@@ -61,6 +61,8 @@ <h5>class Whataclass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class Whataclass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass/noSuchMethod.html b/testing/test_package_docs/test_package_imported.main/Whataclass/noSuchMethod.html
index 9dafcee428..9933689866 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass/noSuchMethod.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Whataclass</h5>
+    <h5>Whataclass class</h5>
     <ol>
       <li class="section-title"><a href="test_package_imported.main/Whataclass-class.html#constructors">Constructors</a></li>
       <li><a href="test_package_imported.main/Whataclass/Whataclass.html">Whataclass</a></li>
@@ -61,6 +61,8 @@ <h5>class Whataclass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -71,7 +73,6 @@ <h5>class Whataclass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass/operator_equals.html b/testing/test_package_docs/test_package_imported.main/Whataclass/operator_equals.html
index 18e3fe68f8..8de52854d6 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass/operator_equals.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Whataclass</h5>
+    <h5>Whataclass class</h5>
     <ol>
       <li class="section-title"><a href="test_package_imported.main/Whataclass-class.html#constructors">Constructors</a></li>
       <li><a href="test_package_imported.main/Whataclass/Whataclass.html">Whataclass</a></li>
@@ -61,6 +61,8 @@ <h5>class Whataclass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -71,7 +73,6 @@ <h5>class Whataclass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass/runtimeType.html b/testing/test_package_docs/test_package_imported.main/Whataclass/runtimeType.html
index 12aee2f88c..6c69610124 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass/runtimeType.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Whataclass</h5>
+    <h5>Whataclass class</h5>
     <ol>
       <li class="section-title"><a href="test_package_imported.main/Whataclass-class.html#constructors">Constructors</a></li>
       <li><a href="test_package_imported.main/Whataclass/Whataclass.html">Whataclass</a></li>
@@ -61,6 +61,8 @@ <h5>class Whataclass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class Whataclass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass/toString.html b/testing/test_package_docs/test_package_imported.main/Whataclass/toString.html
index 3cfe8aa09a..4e6908bc6e 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass/toString.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;T&gt;</span></a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Whataclass</h5>
+    <h5>Whataclass class</h5>
     <ol>
       <li class="section-title"><a href="test_package_imported.main/Whataclass-class.html#constructors">Constructors</a></li>
       <li><a href="test_package_imported.main/Whataclass/Whataclass.html">Whataclass</a></li>
@@ -61,6 +61,8 @@ <h5>class Whataclass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -71,7 +73,6 @@ <h5>class Whataclass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass2-class.html b/testing/test_package_docs/test_package_imported.main/Whataclass2-class.html
index 6bf889361e..e33f9c70f0 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass2-class.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass2-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
-    <li class="self-crumb">class Whataclass2</li>
+    <li class="self-crumb">Whataclass2 class</li>
   </ol>
   <div class="self-name">Whataclass2</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library test_package_imported.main</h5>
+    <h5>test_package_imported.main library</h5>
     <ol>
       <li class="section-title"><a href="test_package_imported.main/test_package_imported.main-library.html#classes">Classes</a></li>
       <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a></li>
@@ -51,6 +51,7 @@ <h5>library test_package_imported.main</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Whataclass2 class</h1>
 
     <section class="desc markdown">
       <p>Some docs for whataclass 2</p>
@@ -138,7 +139,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class Whataclass2</h5>
     <ol>
       <li class="section-title"><a href="test_package_imported.main/Whataclass2-class.html#constructors">Constructors</a></li>
       <li><a href="test_package_imported.main/Whataclass2/Whataclass2.html">Whataclass2</a></li>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass2/Whataclass2.html b/testing/test_package_docs/test_package_imported.main/Whataclass2/Whataclass2.html
index a0904680d1..65a51924e8 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass2/Whataclass2.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass2/Whataclass2.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     <li><a href="test_package_imported.main/Whataclass2-class.html">Whataclass2</a></li>
-    <li class="self-crumb">constructor Whataclass2</li>
+    <li class="self-crumb">Whataclass2 constructor</li>
   </ol>
   <div class="self-name">Whataclass2</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Whataclass2</h5>
+    <h5>Whataclass2 class</h5>
     <ol>
       <li class="section-title"><a href="test_package_imported.main/Whataclass2-class.html#constructors">Constructors</a></li>
       <li><a href="test_package_imported.main/Whataclass2/Whataclass2.html">Whataclass2</a></li>
@@ -61,6 +61,8 @@ <h5>class Whataclass2</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>Whataclass2 constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">Whataclass2</span>(<wbr>)
@@ -72,7 +74,6 @@ <h5>class Whataclass2</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor Whataclass2</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass2/hashCode.html b/testing/test_package_docs/test_package_imported.main/Whataclass2/hashCode.html
index 094bd76ff6..638185a75c 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass2/hashCode.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass2/hashCode.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     <li><a href="test_package_imported.main/Whataclass2-class.html">Whataclass2</a></li>
-    <li class="self-crumb">property hashCode</li>
+    <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Whataclass2</h5>
+    <h5>Whataclass2 class</h5>
     <ol>
       <li class="section-title"><a href="test_package_imported.main/Whataclass2-class.html#constructors">Constructors</a></li>
       <li><a href="test_package_imported.main/Whataclass2/Whataclass2.html">Whataclass2</a></li>
@@ -61,6 +61,8 @@ <h5>class Whataclass2</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class Whataclass2</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property hashCode</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass2/noSuchMethod.html b/testing/test_package_docs/test_package_imported.main/Whataclass2/noSuchMethod.html
index 1bb97b3f32..f48fd452bb 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass2/noSuchMethod.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass2/noSuchMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     <li><a href="test_package_imported.main/Whataclass2-class.html">Whataclass2</a></li>
-    <li class="self-crumb">method noSuchMethod</li>
+    <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Whataclass2</h5>
+    <h5>Whataclass2 class</h5>
     <ol>
       <li class="section-title"><a href="test_package_imported.main/Whataclass2-class.html#constructors">Constructors</a></li>
       <li><a href="test_package_imported.main/Whataclass2/Whataclass2.html">Whataclass2</a></li>
@@ -61,6 +61,8 @@ <h5>class Whataclass2</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
       <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
@@ -71,7 +73,6 @@ <h5>class Whataclass2</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method noSuchMethod</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass2/operator_equals.html b/testing/test_package_docs/test_package_imported.main/Whataclass2/operator_equals.html
index 9d7a584c37..0f398af9b4 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass2/operator_equals.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass2/operator_equals.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     <li><a href="test_package_imported.main/Whataclass2-class.html">Whataclass2</a></li>
-    <li class="self-crumb">method operator ==</li>
+    <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Whataclass2</h5>
+    <h5>Whataclass2 class</h5>
     <ol>
       <li class="section-title"><a href="test_package_imported.main/Whataclass2-class.html#constructors">Constructors</a></li>
       <li><a href="test_package_imported.main/Whataclass2/Whataclass2.html">Whataclass2</a></li>
@@ -61,6 +61,8 @@ <h5>class Whataclass2</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
       <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
@@ -71,7 +73,6 @@ <h5>class Whataclass2</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method operator ==</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass2/runtimeType.html b/testing/test_package_docs/test_package_imported.main/Whataclass2/runtimeType.html
index 07cc715195..990c887b27 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass2/runtimeType.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass2/runtimeType.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     <li><a href="test_package_imported.main/Whataclass2-class.html">Whataclass2</a></li>
-    <li class="self-crumb">property runtimeType</li>
+    <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Whataclass2</h5>
+    <h5>Whataclass2 class</h5>
     <ol>
       <li class="section-title"><a href="test_package_imported.main/Whataclass2-class.html#constructors">Constructors</a></li>
       <li><a href="test_package_imported.main/Whataclass2/Whataclass2.html">Whataclass2</a></li>
@@ -61,6 +61,8 @@ <h5>class Whataclass2</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
 
         <section id="getter">
         
@@ -75,7 +77,6 @@ <h5>class Whataclass2</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>property runtimeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass2/toString.html b/testing/test_package_docs/test_package_imported.main/Whataclass2/toString.html
index 4b2d562fd1..6dfe761a91 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass2/toString.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass2/toString.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     <li><a href="test_package_imported.main/Whataclass2-class.html">Whataclass2</a></li>
-    <li class="self-crumb">method toString</li>
+    <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class Whataclass2</h5>
+    <h5>Whataclass2 class</h5>
     <ol>
       <li class="section-title"><a href="test_package_imported.main/Whataclass2-class.html#constructors">Constructors</a></li>
       <li><a href="test_package_imported.main/Whataclass2/Whataclass2.html">Whataclass2</a></li>
@@ -61,6 +61,8 @@ <h5>class Whataclass2</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">String</span>
       <span class="name ">toString</span>(<wbr>)
@@ -71,7 +73,6 @@ <h5>class Whataclass2</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>method toString</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html b/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html
index 54d7bebf74..8847cce041 100644
--- a/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html
+++ b/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html
@@ -24,7 +24,7 @@
   <button id="sidenav-left-toggle" type="button">&nbsp;</button>
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
-    <li class="self-crumb">library test_package_imported.main</li>
+    <li class="self-crumb">test_package_imported.main library</li>
   </ol>
   <div class="self-name">test_package_imported.main</div>
   <form class="search navbar-right" role="search">
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>package test_package</h5>
+    <h5>test_package package</h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
@@ -54,6 +54,7 @@ <h5>package test_package</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>test_package_imported.main library</h1>
 
     
     <section class="summary offset-anchor" id="classes">
@@ -84,7 +85,7 @@ <h2>Classes</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>library test_package_imported.main</h5>
+    <h5>test_package_imported.main library</h5>
     <ol>
       <li class="section-title"><a href="test_package_imported.main/test_package_imported.main-library.html#classes">Classes</a></li>
       <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a></li>
diff --git a/testing/test_package_docs/two_exports/BaseClass-class.html b/testing/test_package_docs/two_exports/BaseClass-class.html
index ddf976811c..4a36035c9d 100644
--- a/testing/test_package_docs/two_exports/BaseClass-class.html
+++ b/testing/test_package_docs/two_exports/BaseClass-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="two_exports/two_exports-library.html">two_exports</a></li>
-    <li class="self-crumb">class BaseClass</li>
+    <li class="self-crumb">BaseClass class</li>
   </ol>
   <div class="self-name">BaseClass</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library two_exports</h5>
+    <h5>two_exports library</h5>
     <ol>
       <li class="section-title"><a href="two_exports/two_exports-library.html#classes">Classes</a></li>
       <li><a href="two_exports/BaseClass-class.html">BaseClass</a></li>
@@ -53,6 +53,7 @@ <h5>library two_exports</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>BaseClass class</h1>
 
     
     <section>
@@ -163,7 +164,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class BaseClass</h5>
     <ol>
       <li class="section-title"><a href="two_exports/BaseClass-class.html#constructors">Constructors</a></li>
       <li><a href="two_exports/BaseClass/BaseClass.html">BaseClass</a></li>
diff --git a/testing/test_package_docs/two_exports/BaseClass/BaseClass.html b/testing/test_package_docs/two_exports/BaseClass/BaseClass.html
index 3c976d3eb4..73c2f84d1f 100644
--- a/testing/test_package_docs/two_exports/BaseClass/BaseClass.html
+++ b/testing/test_package_docs/two_exports/BaseClass/BaseClass.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="two_exports/two_exports-library.html">two_exports</a></li>
     <li><a href="two_exports/BaseClass-class.html">BaseClass</a></li>
-    <li class="self-crumb">constructor BaseClass</li>
+    <li class="self-crumb">BaseClass constructor</li>
   </ol>
   <div class="self-name">BaseClass</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class BaseClass</h5>
+    <h5>BaseClass class</h5>
     <ol>
       <li class="section-title"><a href="two_exports/BaseClass-class.html#constructors">Constructors</a></li>
       <li><a href="two_exports/BaseClass/BaseClass.html">BaseClass</a></li>
@@ -62,6 +62,8 @@ <h5>class BaseClass</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>BaseClass constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">BaseClass</span>(<wbr>)
@@ -73,7 +75,6 @@ <h5>class BaseClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor BaseClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/two_exports/ExtendingClass-class.html b/testing/test_package_docs/two_exports/ExtendingClass-class.html
index fbf56e2c6d..53c29c499a 100644
--- a/testing/test_package_docs/two_exports/ExtendingClass-class.html
+++ b/testing/test_package_docs/two_exports/ExtendingClass-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="two_exports/two_exports-library.html">two_exports</a></li>
-    <li class="self-crumb">class ExtendingClass</li>
+    <li class="self-crumb">ExtendingClass class</li>
   </ol>
   <div class="self-name">ExtendingClass</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library two_exports</h5>
+    <h5>two_exports library</h5>
     <ol>
       <li class="section-title"><a href="two_exports/two_exports-library.html#classes">Classes</a></li>
       <li><a href="two_exports/BaseClass-class.html">BaseClass</a></li>
@@ -53,6 +53,7 @@ <h5>library two_exports</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ExtendingClass class</h1>
 
     <section class="desc markdown">
       <p>Extending class extends <a href="two_exports/BaseClass-class.html">BaseClass</a>.</p>
@@ -165,7 +166,6 @@ <h2>Operators</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>class ExtendingClass</h5>
     <ol>
       <li class="section-title"><a href="two_exports/ExtendingClass-class.html#constructors">Constructors</a></li>
       <li><a href="two_exports/ExtendingClass/ExtendingClass.html">ExtendingClass</a></li>
diff --git a/testing/test_package_docs/two_exports/ExtendingClass/ExtendingClass.html b/testing/test_package_docs/two_exports/ExtendingClass/ExtendingClass.html
index c29c471144..eb62c678ee 100644
--- a/testing/test_package_docs/two_exports/ExtendingClass/ExtendingClass.html
+++ b/testing/test_package_docs/two_exports/ExtendingClass/ExtendingClass.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="two_exports/two_exports-library.html">two_exports</a></li>
     <li><a href="two_exports/ExtendingClass-class.html">ExtendingClass</a></li>
-    <li class="self-crumb">constructor ExtendingClass</li>
+    <li class="self-crumb">ExtendingClass constructor</li>
   </ol>
   <div class="self-name">ExtendingClass</div>
   <form class="search navbar-right" role="search">
@@ -37,7 +37,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>class ExtendingClass</h5>
+    <h5>ExtendingClass class</h5>
     <ol>
       <li class="section-title"><a href="two_exports/ExtendingClass-class.html#constructors">Constructors</a></li>
       <li><a href="two_exports/ExtendingClass/ExtendingClass.html">ExtendingClass</a></li>
@@ -62,6 +62,8 @@ <h5>class ExtendingClass</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ExtendingClass constructor</h1>
+
     <section class="multi-line-signature">
       
       <span class="name ">ExtendingClass</span>(<wbr>)
@@ -73,7 +75,6 @@ <h5>class ExtendingClass</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>constructor ExtendingClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/two_exports/topLevelVariable.html b/testing/test_package_docs/two_exports/topLevelVariable.html
index 3e1642be18..3d3158d897 100644
--- a/testing/test_package_docs/two_exports/topLevelVariable.html
+++ b/testing/test_package_docs/two_exports/topLevelVariable.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="two_exports/two_exports-library.html">two_exports</a></li>
-    <li class="self-crumb">property topLevelVariable</li>
+    <li class="self-crumb">topLevelVariable property</li>
   </ol>
   <div class="self-name">topLevelVariable</div>
   <form class="search navbar-right" role="search">
@@ -36,7 +36,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>library two_exports</h5>
+    <h5>two_exports library</h5>
     <ol>
       <li class="section-title"><a href="two_exports/two_exports-library.html#classes">Classes</a></li>
       <li><a href="two_exports/BaseClass-class.html">BaseClass</a></li>
@@ -53,6 +53,8 @@ <h5>library two_exports</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>topLevelVariable top-level property</h1>
+
     <section class="multi-line-signature">
       <span class="returntype">int</span>
       <span class="name ">topLevelVariable</span>      <div class="features">read / write</div>
@@ -63,7 +65,6 @@ <h5>library two_exports</h5>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>top-level property topLevelVariable</h5>
   </div><!--/.sidebar-offcanvas-->
 
 </main>
diff --git a/testing/test_package_docs/two_exports/two_exports-library.html b/testing/test_package_docs/two_exports/two_exports-library.html
index a0fa138335..0480961774 100644
--- a/testing/test_package_docs/two_exports/two_exports-library.html
+++ b/testing/test_package_docs/two_exports/two_exports-library.html
@@ -24,7 +24,7 @@
   <button id="sidenav-left-toggle" type="button">&nbsp;</button>
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
-    <li class="self-crumb">library two_exports</li>
+    <li class="self-crumb">two_exports library</li>
   </ol>
   <div class="self-name">two_exports</div>
   <form class="search navbar-right" role="search">
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>package test_package</h5>
+    <h5>test_package package</h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
@@ -54,6 +54,7 @@ <h5>package test_package</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>two_exports library</h1>
 
     
     <section class="summary offset-anchor" id="classes">
@@ -98,7 +99,7 @@ <h2>Properties</h2>
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-    <h5>library two_exports</h5>
+    <h5>two_exports library</h5>
     <ol>
       <li class="section-title"><a href="two_exports/two_exports-library.html#classes">Classes</a></li>
       <li><a href="two_exports/BaseClass-class.html">BaseClass</a></li>