diff --git a/htroot/env/templates/submenuAccessTracker.template b/htroot/env/templates/submenuAccessTracker.template
index cfb9af0d7..78980f0c7 100644
--- a/htroot/env/templates/submenuAccessTracker.template
+++ b/htroot/env/templates/submenuAccessTracker.template
@@ -17,7 +17,7 @@
         <li><a href="AccessTracker_p.html?page=3" class="MenuItemLink lock">Host Tracker</a></li>
       </ul>
     </div>
-    #(p2p)#::
+    #(navigation-p2p)#::
     <div class="SubMenugroup">
       <h3>Remote Search</h3>
       <ul class="SubMenu">
@@ -25,5 +25,5 @@
         <li><a href="AccessTracker_p.html?page=5" class="MenuItemLink lock">Host Tracker</a></li>
       </ul>
     </div>
-    #(/p2p)#
+    #(/navigation-p2p)#
 </div>
\ No newline at end of file
diff --git a/htroot/env/templates/submenuCrawlMonitor.template b/htroot/env/templates/submenuCrawlMonitor.template
index 2c11f3bee..2046209bc 100644
--- a/htroot/env/templates/submenuCrawlMonitor.template
+++ b/htroot/env/templates/submenuCrawlMonitor.template
@@ -15,8 +15,8 @@
     <h3>Queues</h3>
     <ul class="SubMenu">
       <li><a href="IndexCreateQueues_p.html?stack=LOCAL" class="MenuItemLink lock">Local</a></li>
-      #(p2p)#::<li><a href="IndexCreateQueues_p.html?stack=GLOBAL" class="MenuItemLink lock">Global</a></li>#(/p2p)#
-      #(p2p)#::<li><a href="IndexCreateQueues_p.html?stack=REMOTE" class="MenuItemLink lock">Remote</a></li>#(/p2p)#
+      #(navigation-p2p)#::<li><a href="IndexCreateQueues_p.html?stack=GLOBAL" class="MenuItemLink lock">Global</a></li>#(/navigation-p2p)#
+      #(navigation-p2p)#::<li><a href="IndexCreateQueues_p.html?stack=REMOTE" class="MenuItemLink lock">Remote</a></li>#(/navigation-p2p)#
       <li><a href="IndexCreateQueues_p.html?stack=NOLOAD" class="MenuItemLink lock">No-Load</a></li>
     </ul>
   </div>
@@ -39,12 +39,12 @@
   <div class="SubMenugroup">
       <ul class="SubMenu">
         <li><a href="CrawlResults.html" class="MenuItemLink">Overview</a></li>
-        #(p2p)#::<li><a href="CrawlResults.html?process=1" class="MenuItemLink lock">(1) Receipts</a></li>#(/p2p)#
+        #(navigation-p2p)#::<li><a href="CrawlResults.html?process=1" class="MenuItemLink lock">(1) Receipts</a></li>#(/navigation-p2p)#
         <li><a href="CrawlResults.html?process=2" class="MenuItemLink lock">(2) Queries</a></li>
-        #(p2p)#::<li><a href="CrawlResults.html?process=3" class="MenuItemLink lock">(3) DHT Transfer</a></li>#(/p2p)#
+        #(navigation-p2p)#::<li><a href="CrawlResults.html?process=3" class="MenuItemLink lock">(3) DHT Transfer</a></li>#(/navigation-p2p)#
         <li><a href="CrawlResults.html?process=4" class="MenuItemLink lock">(4) Proxy Use</a></li>
         <li><a href="CrawlResults.html?process=5" class="MenuItemLink lock">(5) Local Crawling</a></li>
-        #(p2p)#::<li><a href="CrawlResults.html?process=6" class="MenuItemLink">(6) Global Crawling</a></li>#(/p2p)#
+        #(navigation-p2p)#::<li><a href="CrawlResults.html?process=6" class="MenuItemLink">(6) Global Crawling</a></li>#(/navigation-p2p)#
         <li><a href="CrawlResults.html?process=7" class="MenuItemLink lock">(7) Surrogate Import</a></li>
       </ul>
   </div>
diff --git a/htroot/env/templates/submenuIndexControl.template b/htroot/env/templates/submenuIndexControl.template
index c0d9782a2..d5ac0eca5 100644
--- a/htroot/env/templates/submenuIndexControl.template
+++ b/htroot/env/templates/submenuIndexControl.template
@@ -6,7 +6,7 @@
     <li><a href="IndexFederated_p.html" class="MenuItemLink lock">Index Sources &amp; Targets</a></li>
     <li><a href="IndexSchema_p.html" class="MenuItemLink lock">Solr Schema Editor</a></li>
     <li><a href="IndexReIndexMonitor_p.html" class="MenuItemLink lock">Field Re-Indexing</a></li>
-    #(p2p)#::<li><a href="IndexControlRWIs_p.html" class="MenuItemLink lock">Reverse Word Index</a></li>#(/p2p)#
+    #(navigation-p2p)#::<li><a href="IndexControlRWIs_p.html" class="MenuItemLink lock">Reverse Word Index</a></li>#(/navigation-p2p)#
     <li><a href="ContentAnalysis_p.html" class="MenuItemLink lock">Content Analysis</a></li>
   </ul>
 </div>