diff --git a/test/docfx.Snapshot.Tests/SamplesTest.Extensions/api/toc.html.view.verified.json b/test/docfx.Snapshot.Tests/SamplesTest.Extensions/api/toc.html.view.verified.json
index 3fde883ce2b..6dc677e5f5e 100644
--- a/test/docfx.Snapshot.Tests/SamplesTest.Extensions/api/toc.html.view.verified.json
+++ b/test/docfx.Snapshot.Tests/SamplesTest.Extensions/api/toc.html.view.verified.json
@@ -1,121 +1,104 @@
 {
   "items": [
     {
-      "name": "Namespaces",
+      "name": "MyExample",
+      "href": "MyExample.html",
+      "topicHref": "MyExample.html",
+      "topicUid": "MyExample",
+      "type": "Namespace",
       "items": [
         {
-          "name": "MyExample",
-          "href": "MyExample.html",
-          "topicHref": "MyExample.html",
-          "topicUid": "MyExample",
-          "type": "Namespace",
+          "name": "ExampleClass",
+          "href": "MyExample.ExampleClass.html",
+          "topicHref": "MyExample.ExampleClass.html",
+          "topicUid": "MyExample.ExampleClass",
+          "type": "Class",
           "items": [
             {
-              "name": "Classes",
+              "name": "Constructors",
               "items": [
                 {
                   "name": "ExampleClass",
-                  "href": "MyExample.ExampleClass.html",
-                  "topicHref": "MyExample.ExampleClass.html",
-                  "topicUid": "MyExample.ExampleClass",
-                  "type": "Class",
-                  "items": [
-                    {
-                      "name": "Constructors",
-                      "items": [
-                        {
-                          "name": "ExampleClass",
-                          "href": "MyExample.ExampleClass.-ctor.html",
-                          "topicHref": "MyExample.ExampleClass.-ctor.html",
-                          "topicUid": "MyExample.ExampleClass.#ctor*",
-                          "type": "Constructor",
-                          "fullName": "MyExample.ExampleClass.ExampleClass",
-                          "nameWithType": "ExampleClass.ExampleClass",
-                          "isEii": false,
-                          "tocHref": null,
-                          "level": 7,
-                          "items": [],
-                          "leaf": true
-                        }
-                      ],
-                      "topicHref": null,
-                      "tocHref": null,
-                      "level": 6,
-                      "leaf": false
-                    },
-                    {
-                      "name": "Properties",
-                      "items": [
-                        {
-                          "name": "MyProperty",
-                          "href": "MyExample.ExampleClass.MyProperty.html",
-                          "topicHref": "MyExample.ExampleClass.MyProperty.html",
-                          "topicUid": "MyExample.ExampleClass.MyProperty*",
-                          "type": "Property",
-                          "fullName": "MyExample.ExampleClass.MyProperty",
-                          "nameWithType": "ExampleClass.MyProperty",
-                          "isEii": false,
-                          "tocHref": null,
-                          "level": 7,
-                          "items": [],
-                          "leaf": true
-                        }
-                      ],
-                      "topicHref": null,
-                      "tocHref": null,
-                      "level": 6,
-                      "leaf": false
-                    },
-                    {
-                      "name": "Methods",
-                      "items": [
-                        {
-                          "name": "MyMethod",
-                          "href": "MyExample.ExampleClass.MyMethod.html",
-                          "topicHref": "MyExample.ExampleClass.MyMethod.html",
-                          "topicUid": "MyExample.ExampleClass.MyMethod*",
-                          "type": "Method",
-                          "fullName": "MyExample.ExampleClass.MyMethod",
-                          "nameWithType": "ExampleClass.MyMethod",
-                          "isEii": false,
-                          "tocHref": null,
-                          "level": 7,
-                          "items": [],
-                          "leaf": true
-                        }
-                      ],
-                      "topicHref": null,
-                      "tocHref": null,
-                      "level": 6,
-                      "leaf": false
-                    },
-                    {
-                      "name": "Events",
-                      "items": [
-                        {
-                          "name": "MyEvent",
-                          "href": "MyExample.ExampleClass.MyEvent.html",
-                          "topicHref": "MyExample.ExampleClass.MyEvent.html",
-                          "topicUid": "MyExample.ExampleClass.MyEvent",
-                          "type": "Event",
-                          "fullName": "MyExample.ExampleClass.MyEvent",
-                          "nameWithType": "ExampleClass.MyEvent",
-                          "isEii": false,
-                          "tocHref": null,
-                          "level": 7,
-                          "items": [],
-                          "leaf": true
-                        }
-                      ],
-                      "topicHref": null,
-                      "tocHref": null,
-                      "level": 6,
-                      "leaf": false
-                    }
-                  ],
+                  "href": "MyExample.ExampleClass.-ctor.html",
+                  "topicHref": "MyExample.ExampleClass.-ctor.html",
+                  "topicUid": "MyExample.ExampleClass.#ctor*",
+                  "type": "Constructor",
+                  "fullName": "MyExample.ExampleClass.ExampleClass",
+                  "nameWithType": "ExampleClass.ExampleClass",
+                  "isEii": false,
                   "tocHref": null,
                   "level": 5,
-                  "leaf": false
+                  "items": [],
+                  "leaf": true
+                }
+              ],
+              "topicHref": null,
+              "tocHref": null,
+              "level": 4,
+              "leaf": false
+            },
+            {
+              "name": "Properties",
+              "items": [
+                {
+                  "name": "MyProperty",
+                  "href": "MyExample.ExampleClass.MyProperty.html",
+                  "topicHref": "MyExample.ExampleClass.MyProperty.html",
+                  "topicUid": "MyExample.ExampleClass.MyProperty*",
+                  "type": "Property",
+                  "fullName": "MyExample.ExampleClass.MyProperty",
+                  "nameWithType": "ExampleClass.MyProperty",
+                  "isEii": false,
+                  "tocHref": null,
+                  "level": 5,
+                  "items": [],
+                  "leaf": true
+                }
+              ],
+              "topicHref": null,
+              "tocHref": null,
+              "level": 4,
+              "leaf": false
+            },
+            {
+              "name": "Methods",
+              "items": [
+                {
+                  "name": "MyMethod",
+                  "href": "MyExample.ExampleClass.MyMethod.html",
+                  "topicHref": "MyExample.ExampleClass.MyMethod.html",
+                  "topicUid": "MyExample.ExampleClass.MyMethod*",
+                  "type": "Method",
+                  "fullName": "MyExample.ExampleClass.MyMethod",
+                  "nameWithType": "ExampleClass.MyMethod",
+                  "isEii": false,
+                  "tocHref": null,
+                  "level": 5,
+                  "items": [],
+                  "leaf": true
+                }
+              ],
+              "topicHref": null,
+              "tocHref": null,
+              "level": 4,
+              "leaf": false
+            },
+            {
+              "name": "Events",
+              "items": [
+                {
+                  "name": "MyEvent",
+                  "href": "MyExample.ExampleClass.MyEvent.html",
+                  "topicHref": "MyExample.ExampleClass.MyEvent.html",
+                  "topicUid": "MyExample.ExampleClass.MyEvent",
+                  "type": "Event",
+                  "fullName": "MyExample.ExampleClass.MyEvent",
+                  "nameWithType": "ExampleClass.MyEvent",
+                  "isEii": false,
+                  "tocHref": null,
+                  "level": 5,
+                  "items": [],
+                  "leaf": true
                 }
               ],
               "topicHref": null,
@@ -129,7 +112,6 @@
           "leaf": false
         }
       ],
-      "topicHref": null,
       "tocHref": null,
       "level": 2,
       "leaf": false
diff --git a/test/docfx.Snapshot.Tests/SamplesTest.Extensions/api/toc.json.view.verified.json b/test/docfx.Snapshot.Tests/SamplesTest.Extensions/api/toc.json.view.verified.json
index 9445945054e..650dcc23752 100644
--- a/test/docfx.Snapshot.Tests/SamplesTest.Extensions/api/toc.json.view.verified.json
+++ b/test/docfx.Snapshot.Tests/SamplesTest.Extensions/api/toc.json.view.verified.json
@@ -1,3 +1,3 @@
 {
-  "content": "{\"items\":[{\"name\":\"Namespaces\",\"items\":[{\"name\":\"MyExample\",\"href\":\"MyExample.html\",\"topicHref\":\"MyExample.html\",\"topicUid\":\"MyExample\",\"type\":\"Namespace\",\"items\":[{\"name\":\"Classes\",\"items\":[{\"name\":\"ExampleClass\",\"href\":\"MyExample.ExampleClass.html\",\"topicHref\":\"MyExample.ExampleClass.html\",\"topicUid\":\"MyExample.ExampleClass\",\"type\":\"Class\",\"items\":[{\"name\":\"Constructors\",\"items\":[{\"name\":\"ExampleClass\",\"href\":\"MyExample.ExampleClass.-ctor.html\",\"topicHref\":\"MyExample.ExampleClass.-ctor.html\",\"topicUid\":\"MyExample.ExampleClass.#ctor*\",\"type\":\"Constructor\",\"fullName\":\"MyExample.ExampleClass.ExampleClass\",\"nameWithType\":\"ExampleClass.ExampleClass\",\"isEii\":false,\"tocHref\":null,\"level\":7,\"items\":[],\"leaf\":true}],\"topicHref\":null,\"tocHref\":null,\"level\":6,\"leaf\":false},{\"name\":\"Properties\",\"items\":[{\"name\":\"MyProperty\",\"href\":\"MyExample.ExampleClass.MyProperty.html\",\"topicHref\":\"MyExample.ExampleClass.MyProperty.html\",\"topicUid\":\"MyExample.ExampleClass.MyProperty*\",\"type\":\"Property\",\"fullName\":\"MyExample.ExampleClass.MyProperty\",\"nameWithType\":\"ExampleClass.MyProperty\",\"isEii\":false,\"tocHref\":null,\"level\":7,\"items\":[],\"leaf\":true}],\"topicHref\":null,\"tocHref\":null,\"level\":6,\"leaf\":false},{\"name\":\"Methods\",\"items\":[{\"name\":\"MyMethod\",\"href\":\"MyExample.ExampleClass.MyMethod.html\",\"topicHref\":\"MyExample.ExampleClass.MyMethod.html\",\"topicUid\":\"MyExample.ExampleClass.MyMethod*\",\"type\":\"Method\",\"fullName\":\"MyExample.ExampleClass.MyMethod\",\"nameWithType\":\"ExampleClass.MyMethod\",\"isEii\":false,\"tocHref\":null,\"level\":7,\"items\":[],\"leaf\":true}],\"topicHref\":null,\"tocHref\":null,\"level\":6,\"leaf\":false},{\"name\":\"Events\",\"items\":[{\"name\":\"MyEvent\",\"href\":\"MyExample.ExampleClass.MyEvent.html\",\"topicHref\":\"MyExample.ExampleClass.MyEvent.html\",\"topicUid\":\"MyExample.ExampleClass.MyEvent\",\"type\":\"Event\",\"fullName\":\"MyExample.ExampleClass.MyEvent\",\"nameWithType\":\"ExampleClass.MyEvent\",\"isEii\":false,\"tocHref\":null,\"level\":7,\"items\":[],\"leaf\":true}],\"topicHref\":null,\"tocHref\":null,\"level\":6,\"leaf\":false}],\"tocHref\":null,\"level\":5,\"leaf\":false}],\"topicHref\":null,\"tocHref\":null,\"level\":4,\"leaf\":false}],\"tocHref\":null,\"level\":3,\"leaf\":false}],\"topicHref\":null,\"tocHref\":null,\"level\":2,\"leaf\":false}],\"memberLayout\":\"SeparatePages\",\"topicHref\":null,\"tocHref\":null,\"name\":null,\"level\":1,\"leaf\":false}"
+  "content": "{\"items\":[{\"name\":\"MyExample\",\"href\":\"MyExample.html\",\"topicHref\":\"MyExample.html\",\"topicUid\":\"MyExample\",\"type\":\"Namespace\",\"items\":[{\"name\":\"ExampleClass\",\"href\":\"MyExample.ExampleClass.html\",\"topicHref\":\"MyExample.ExampleClass.html\",\"topicUid\":\"MyExample.ExampleClass\",\"type\":\"Class\",\"items\":[{\"name\":\"Constructors\",\"items\":[{\"name\":\"ExampleClass\",\"href\":\"MyExample.ExampleClass.-ctor.html\",\"topicHref\":\"MyExample.ExampleClass.-ctor.html\",\"topicUid\":\"MyExample.ExampleClass.#ctor*\",\"type\":\"Constructor\",\"fullName\":\"MyExample.ExampleClass.ExampleClass\",\"nameWithType\":\"ExampleClass.ExampleClass\",\"isEii\":false,\"tocHref\":null,\"level\":5,\"items\":[],\"leaf\":true}],\"topicHref\":null,\"tocHref\":null,\"level\":4,\"leaf\":false},{\"name\":\"Properties\",\"items\":[{\"name\":\"MyProperty\",\"href\":\"MyExample.ExampleClass.MyProperty.html\",\"topicHref\":\"MyExample.ExampleClass.MyProperty.html\",\"topicUid\":\"MyExample.ExampleClass.MyProperty*\",\"type\":\"Property\",\"fullName\":\"MyExample.ExampleClass.MyProperty\",\"nameWithType\":\"ExampleClass.MyProperty\",\"isEii\":false,\"tocHref\":null,\"level\":5,\"items\":[],\"leaf\":true}],\"topicHref\":null,\"tocHref\":null,\"level\":4,\"leaf\":false},{\"name\":\"Methods\",\"items\":[{\"name\":\"MyMethod\",\"href\":\"MyExample.ExampleClass.MyMethod.html\",\"topicHref\":\"MyExample.ExampleClass.MyMethod.html\",\"topicUid\":\"MyExample.ExampleClass.MyMethod*\",\"type\":\"Method\",\"fullName\":\"MyExample.ExampleClass.MyMethod\",\"nameWithType\":\"ExampleClass.MyMethod\",\"isEii\":false,\"tocHref\":null,\"level\":5,\"items\":[],\"leaf\":true}],\"topicHref\":null,\"tocHref\":null,\"level\":4,\"leaf\":false},{\"name\":\"Events\",\"items\":[{\"name\":\"MyEvent\",\"href\":\"MyExample.ExampleClass.MyEvent.html\",\"topicHref\":\"MyExample.ExampleClass.MyEvent.html\",\"topicUid\":\"MyExample.ExampleClass.MyEvent\",\"type\":\"Event\",\"fullName\":\"MyExample.ExampleClass.MyEvent\",\"nameWithType\":\"ExampleClass.MyEvent\",\"isEii\":false,\"tocHref\":null,\"level\":5,\"items\":[],\"leaf\":true}],\"topicHref\":null,\"tocHref\":null,\"level\":4,\"leaf\":false}],\"tocHref\":null,\"level\":3,\"leaf\":false}],\"tocHref\":null,\"level\":2,\"leaf\":false}],\"memberLayout\":\"SeparatePages\",\"topicHref\":null,\"tocHref\":null,\"name\":null,\"level\":1,\"leaf\":false}"
 }
\ No newline at end of file
diff --git a/test/docfx.Snapshot.Tests/SamplesTest.Extensions/api/toc.verified.json b/test/docfx.Snapshot.Tests/SamplesTest.Extensions/api/toc.verified.json
index 853804b3f61..fc861cd98be 100644
--- a/test/docfx.Snapshot.Tests/SamplesTest.Extensions/api/toc.verified.json
+++ b/test/docfx.Snapshot.Tests/SamplesTest.Extensions/api/toc.verified.json
@@ -1,2 +1,2 @@
 
-{"items":[{"name":"Namespaces","items":[{"name":"MyExample","href":"MyExample.html","topicHref":"MyExample.html","topicUid":"MyExample","type":"Namespace","items":[{"name":"Classes","items":[{"name":"ExampleClass","href":"MyExample.ExampleClass.html","topicHref":"MyExample.ExampleClass.html","topicUid":"MyExample.ExampleClass","type":"Class","items":[{"name":"Constructors","items":[{"name":"ExampleClass","href":"MyExample.ExampleClass.-ctor.html","topicHref":"MyExample.ExampleClass.-ctor.html","topicUid":"MyExample.ExampleClass.#ctor*","type":"Constructor","fullName":"MyExample.ExampleClass.ExampleClass","nameWithType":"ExampleClass.ExampleClass","isEii":false,"tocHref":null,"level":7,"items":[],"leaf":true}],"topicHref":null,"tocHref":null,"level":6,"leaf":false},{"name":"Properties","items":[{"name":"MyProperty","href":"MyExample.ExampleClass.MyProperty.html","topicHref":"MyExample.ExampleClass.MyProperty.html","topicUid":"MyExample.ExampleClass.MyProperty*","type":"Property","fullName":"MyExample.ExampleClass.MyProperty","nameWithType":"ExampleClass.MyProperty","isEii":false,"tocHref":null,"level":7,"items":[],"leaf":true}],"topicHref":null,"tocHref":null,"level":6,"leaf":false},{"name":"Methods","items":[{"name":"MyMethod","href":"MyExample.ExampleClass.MyMethod.html","topicHref":"MyExample.ExampleClass.MyMethod.html","topicUid":"MyExample.ExampleClass.MyMethod*","type":"Method","fullName":"MyExample.ExampleClass.MyMethod","nameWithType":"ExampleClass.MyMethod","isEii":false,"tocHref":null,"level":7,"items":[],"leaf":true}],"topicHref":null,"tocHref":null,"level":6,"leaf":false},{"name":"Events","items":[{"name":"MyEvent","href":"MyExample.ExampleClass.MyEvent.html","topicHref":"MyExample.ExampleClass.MyEvent.html","topicUid":"MyExample.ExampleClass.MyEvent","type":"Event","fullName":"MyExample.ExampleClass.MyEvent","nameWithType":"ExampleClass.MyEvent","isEii":false,"tocHref":null,"level":7,"items":[],"leaf":true}],"topicHref":null,"tocHref":null,"level":6,"leaf":false}],"tocHref":null,"level":5,"leaf":false}],"topicHref":null,"tocHref":null,"level":4,"leaf":false}],"tocHref":null,"level":3,"leaf":false}],"topicHref":null,"tocHref":null,"level":2,"leaf":false}],"memberLayout":"SeparatePages","topicHref":null,"tocHref":null,"name":null,"level":1,"leaf":false}
+{"items":[{"name":"MyExample","href":"MyExample.html","topicHref":"MyExample.html","topicUid":"MyExample","type":"Namespace","items":[{"name":"ExampleClass","href":"MyExample.ExampleClass.html","topicHref":"MyExample.ExampleClass.html","topicUid":"MyExample.ExampleClass","type":"Class","items":[{"name":"Constructors","items":[{"name":"ExampleClass","href":"MyExample.ExampleClass.-ctor.html","topicHref":"MyExample.ExampleClass.-ctor.html","topicUid":"MyExample.ExampleClass.#ctor*","type":"Constructor","fullName":"MyExample.ExampleClass.ExampleClass","nameWithType":"ExampleClass.ExampleClass","isEii":false,"tocHref":null,"level":5,"items":[],"leaf":true}],"topicHref":null,"tocHref":null,"level":4,"leaf":false},{"name":"Properties","items":[{"name":"MyProperty","href":"MyExample.ExampleClass.MyProperty.html","topicHref":"MyExample.ExampleClass.MyProperty.html","topicUid":"MyExample.ExampleClass.MyProperty*","type":"Property","fullName":"MyExample.ExampleClass.MyProperty","nameWithType":"ExampleClass.MyProperty","isEii":false,"tocHref":null,"level":5,"items":[],"leaf":true}],"topicHref":null,"tocHref":null,"level":4,"leaf":false},{"name":"Methods","items":[{"name":"MyMethod","href":"MyExample.ExampleClass.MyMethod.html","topicHref":"MyExample.ExampleClass.MyMethod.html","topicUid":"MyExample.ExampleClass.MyMethod*","type":"Method","fullName":"MyExample.ExampleClass.MyMethod","nameWithType":"ExampleClass.MyMethod","isEii":false,"tocHref":null,"level":5,"items":[],"leaf":true}],"topicHref":null,"tocHref":null,"level":4,"leaf":false},{"name":"Events","items":[{"name":"MyEvent","href":"MyExample.ExampleClass.MyEvent.html","topicHref":"MyExample.ExampleClass.MyEvent.html","topicUid":"MyExample.ExampleClass.MyEvent","type":"Event","fullName":"MyExample.ExampleClass.MyEvent","nameWithType":"ExampleClass.MyEvent","isEii":false,"tocHref":null,"level":5,"items":[],"leaf":true}],"topicHref":null,"tocHref":null,"level":4,"leaf":false}],"tocHref":null,"level":3,"leaf":false}],"tocHref":null,"level":2,"leaf":false}],"memberLayout":"SeparatePages","topicHref":null,"tocHref":null,"name":null,"level":1,"leaf":false}