diff --git a/templates/common/ManagedReference.common.js b/templates/common/ManagedReference.common.js
index 4a5631e26a3..b36ad38f59e 100644
--- a/templates/common/ManagedReference.common.js
+++ b/templates/common/ManagedReference.common.js
@@ -20,7 +20,6 @@ exports.transform = function (model) {
       case 'namespace':
         model.isNamespace = true;
         if (model.children) groupChildren(model, namespaceCategory);
-        model[getTypePropertyName(model.type)] = true;
         break;
       case 'class':
       case 'interface':
diff --git a/templates/common/partials/namespaceSubtitle.tmpl.partial b/templates/common/partials/namespaceSubtitle.tmpl.partial
index b3a30d8c890..3abacbdcf35 100644
--- a/templates/common/partials/namespaceSubtitle.tmpl.partial
+++ b/templates/common/partials/namespaceSubtitle.tmpl.partial
@@ -1,9 +1,8 @@
 {{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
-{{^isNamespace}}
+
 {{#inNamespace}}
 {{__global.namespacesInSubtitle}}
 {{/inNamespace}}
-{{/isNamespace}}
 {{#inClass}}
 {{__global.classesInSubtitle}}
 {{/inClass}}
diff --git a/templates/default/partials/title.tmpl.partial b/templates/default/partials/title.tmpl.partial
index 38c62fe55f6..7d13bac14fc 100644
--- a/templates/default/partials/title.tmpl.partial
+++ b/templates/default/partials/title.tmpl.partial
@@ -2,9 +2,9 @@
 {{#inPackage}}
 Package {{name.0.value}}
 {{/inPackage}}
-{{#inNamespace}}
+{{#isNamespace}}
 Namespace {{name.0.value}}
-{{/inNamespace}}
+{{/isNamespace}}
 {{#inClass}}
 Class {{name.0.value}}
 {{/inClass}}