diff --git a/mkdocs.yml b/mkdocs.yml
index 466fc8131a25ea91f953a268353bdf4e0a7c9c69..611e4bcb8da67ee3b7df3abc525be663f91c6f1e 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -10,18 +10,18 @@ nav:
   - Managed nmaas:
     - Introduction: 'managed-nmaas/introduction.md'
     - nmaas Playground Instance: 'managed-nmaas/nmaas-playground-instance.md'
-  - Self-Hosted NMaaS:
+  - Self-Hosted nmaas:
     - Introduction: 'self-hosted-nmaas/introduction.md'
     - Installation Guide: 'self-hosted-nmaas/install-guide.md'
     - Local Development Environment:
       - Introduction: 'self-hosted-nmaas/local-dev-environment/introduction.md'
       - Part 1 - Deploying a Local Kubernetes Cluster: 'self-hosted-nmaas/local-dev-environment/p1_local-kubernetes-cluster.md'
-      - Part 2 - Installing NMaaS: 'self-hosted-nmaas/local-dev-environment/p2_installing-nmaas.md'
+      - Part 2 - Installing nmaas: 'self-hosted-nmaas/local-dev-environment/p2_installing-nmaas.md'
       - Part 3 - Demo Network Environment: 'self-hosted-nmaas/local-dev-environment/p3_demo-network-environment.md'
       - Part 4 - Monitoring the Demo Network Environment: 'self-hosted-nmaas/local-dev-environment/p4_monitoring-demo-network-environment.md'
       - Part 5 - Adding a Custom Application: 'self-hosted-nmaas/local-dev-environment/p5_adding_custom_app.md'
       - Appendix - Credentials: 'self-hosted-nmaas/local-dev-environment/appendix.md'
-  - NMaaS Use-Cases:
+  - nmaas Use-Cases:
     - Virtual NOC:
       - Introduction: 'use-cases/virtual-noc/vnoc-introduction.md'
     - Virtual Lab:
@@ -29,7 +29,7 @@ nav:
       - Bulk Domain Deployment: 'use-cases/virtual-lab/bulk-domain-deployment.md'
       - Domain Groups: 'use-cases/virtual-lab/domain-groups.md'
       - Bulk Application Deployment: 'use-cases/virtual-lab/bulk-application-deployment.md'
-  - NMaaS Applications:
+  - nmaas Applications:
     - General Application Deployment: 'nmaas-applications/general-app-deployment.md'
     - List of Supported Applications: 'nmaas-applications/application-list.md'
     - Adding a New Application: 'nmaas-applications/new-application.md'
@@ -67,14 +67,14 @@ nav:
       - GP4L Orchestrator: 'nmaas-applications/tutorials/gp4l-orchestrator.md'
       - Apache Airflow: 'nmaas-applications/tutorials/apache-airflow.md'
   - Blog:
-    - NMaaS-101 - "Hello NMaaS !": 'blog/blog1/nmaas-101-1.md'
-    - NMaaS-101 - "I can help! But... Please could you open these two doors?": 'blog/blog2/nmaas-101-2.md'
-    - NMaaS-101 - "My name is Oxidized and I'm a nifty configuration management tool": 'blog/blog3/nmaas-101-3.md'
-    - NMaaS-101 - "Prometheus" : 'blog/blog4/nmaas-101-4.md'
+    - nmaas-101 - "Hello nmaas!": 'blog/blog1/nmaas-101-1.md'
+    - nmaas-101 - "I can help! But... Please could you open these two doors?": 'blog/blog2/nmaas-101-2.md'
+    - nmaas-101 - "My name is Oxidized and I'm a nifty configuration management tool": 'blog/blog3/nmaas-101-3.md'
+    - nmaas-101 - "Prometheus" : 'blog/blog4/nmaas-101-4.md'
   - Release Notes: 
     - '1.6.0': 'release-notes/1.6.0.md' 
     - '1.5.4': 'release-notes/1.5.4.md' 
-  - NMaaS Presentations: 'nmaas-presentations.md'
+  - nmaas Presentations: 'nmaas-presentations.md'
   - FAQ: faq.md
   - Contact: contact.md
   - About: about.md