diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Layout/NavMenu.razor b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Layout/NavMenu.razor
index db5f95f6..c4a7f508 100644
--- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Layout/NavMenu.razor
+++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Layout/NavMenu.razor
@@ -17,7 +17,7 @@
 
             <AuthorizeView>
                 <Authorized>
-                    @* Admin section — Admin role only *@
+                    @* Admin section — Administrator role only *@
                     <AuthorizeView Policy="@AuthorizationPolicies.RequireAdmin">
                         <Authorized Context="adminContext">
                             <NavSection Title="Admin"
@@ -32,7 +32,7 @@
                                 <li class="nav-item">
                                     <NavLink class="nav-link" href="/admin/api-keys">API Keys</NavLink>
                                 </li>
-                                @* Import Bundle requires Admin only — Design role is not sufficient.
+                                @* Import Bundle requires Administrator only — Designer role is not sufficient.
                                    Export Bundle lives in the Design section (RequireDesign). *@
                                 <li class="nav-item">
                                     <NavLink class="nav-link" href="/design/transport/import">Import Bundle</NavLink>
@@ -41,7 +41,7 @@
                         </Authorized>
                     </AuthorizeView>
 
-                    @* Design section — Design role *@
+                    @* Design section — Designer role *@
                     <AuthorizeView Policy="@AuthorizationPolicies.RequireDesign">
                         <Authorized Context="designContext">
                             <NavSection Title="Design"
@@ -66,7 +66,7 @@
                         </Authorized>
                     </AuthorizeView>
 
-                    @* Deployment section — Deployment role *@
+                    @* Deployment section — Deployer role *@
                     <AuthorizeView Policy="@AuthorizationPolicies.RequireDeployment">
                         <Authorized Context="deploymentContext">
                             <NavSection Title="Deployment"
@@ -117,9 +117,9 @@
                         </AuthorizeView>
                     </NavSection>
 
-                    @* Site Calls — Site Call Audit (#22). Deployment-role only,
+                    @* Site Calls — Site Call Audit (#22). Deployer-role only,
                        matching the Notification Report page's gate; the whole
-                       section sits inside the policy block so a non-Deployment
+                       section sits inside the policy block so a non-Deployer
                        user does not see the heading. *@
                     <AuthorizeView Policy="@AuthorizationPolicies.RequireDeployment">
                         <Authorized Context="siteCallsContext">
@@ -134,7 +134,7 @@
                     </AuthorizeView>
 
                     @* Monitoring — Health Dashboard is all-roles; Event Logs and
-                       Parked Messages are Deployment-role only (Component-CentralUI).
+                       Parked Messages are Deployer-role only (Component-CentralUI).
                        The section is ungated because Health Dashboard is always
                        a visible child. *@
                     <NavSection Title="Monitoring"
@@ -160,8 +160,9 @@
                        Configuration Audit Log (IAuditService config-change
                        viewer). The whole section sits inside the policy block:
                        a non-audit user does not even see the heading.
-                       OperationalAudit is satisfied by the Admin, Audit, and
-                       AuditReadOnly roles. *@
+                       OperationalAudit is satisfied by the Administrator and
+                       Viewer roles (post-Task-1.7 canonical collapse: former
+                       Audit→Administrator, AuditReadOnly→Viewer). *@
                     <AuthorizeView Policy="@AuthorizationPolicies.OperationalAudit">
                         <Authorized Context="auditContext">
                             <NavSection Title="Audit"