diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f144e9f007..0f3ae89fa8 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13595,10 +13595,10 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-	<key>RetrieveNeighboringRegion</key>
+	<key>PathfindingRetrieveNeighboringRegion</key>
     <map>
       <key>Comment</key>
-      <string>Download a neighboring region when visualize a navmesh (default val 99 is for the current region).</string>
+      <string>Download a neighboring region when visualizing a pathfinding navmesh (default val 99 means do not download neighbors).</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -13609,7 +13609,7 @@
 	<key>PathfindingNavMeshClear</key>
     <map>
       <key>Comment</key>
-      <string>Background color</string>
+      <string>Background color when displaying pathfinding navmesh.</string>
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
@@ -13625,7 +13625,7 @@
  <key>PathfindingWalkable</key>
     <map>
       <key>Comment</key>
-      <string>Walkable color</string>
+      <string>Color of walkable objects when displaying pathfinding navmesh object types.</string>
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
@@ -13641,7 +13641,7 @@
  <key>PathfindingObstacle</key>
     <map>
       <key>Comment</key>
-      <string>Obstacle color</string>
+      <string>Color of static obstacle objects when displaying pathfinding navmesh object types.</string>
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
@@ -13657,7 +13657,7 @@
  <key>PathfindingMaterial</key>
     <map>
       <key>Comment</key>
-      <string>Material volume color</string>
+      <string>Color of material volumes when displaying pathfinding navmesh object types.</string>
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
@@ -13673,7 +13673,7 @@
  <key>PathfindingExclusion</key>
     <map>
       <key>Comment</key>
-      <string>Exclusion volume color</string>
+      <string>Color of exclusion volumes when displaying pathfinding navmesh object types.</string>
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
@@ -13689,7 +13689,7 @@
  <key>PathfindingConnectedEdge</key>
     <map>
       <key>Comment</key>
-      <string>Connected edge color</string>
+      <string>Color of a connected (crossable) edge when displaying pathfinding navmesh.</string>
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
@@ -13705,7 +13705,7 @@
  <key>PathfindingBoundaryEdge</key>
     <map>
       <key>Comment</key>
-      <string>Boundary edge color</string>
+      <string>Color of a boundary (non-crossable) edge when displaying pathfinding navmesh.</string>
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
@@ -13721,7 +13721,7 @@
  <key>PathfindingHeatColorBase</key>
     <map>
       <key>Comment</key>
-      <string>Least walkable heat map color</string>
+      <string>Color of the least walkable value when displaying the pathfinding navmesh as a heatmap.</string>
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
@@ -13737,7 +13737,7 @@
  <key>PathfindingHeatColorMax</key>
     <map>
       <key>Comment</key>
-      <string>Most walkable heat map color</string>
+      <string>Color of the most walkable value when displaying the pathfinding navmesh as a heatmap.</string>
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
@@ -13753,7 +13753,7 @@
   <key>PathfindingFaceColor</key>
     <map>
       <key>Comment</key>
-      <string>Nav mesh color?</string>
+      <string>Color of the faces when displaying the default view of the pathfinding navmesh.</string>
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
@@ -13766,10 +13766,10 @@
         <real>1.0</real>
       </array>
     </map>
- 	 <key>PathfindingStarValidColor</key>
+ 	 <key>PathfindingTestPathValidEndColor</key>
     <map>
       <key>Comment</key>
-      <string>yay!</string>
+      <string>Color of the pathfinding test-pathing tool end-point when the path is valid.</string>
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
@@ -13782,10 +13782,10 @@
         <real>1.0</real>
       </array>
     </map>
-     <key>PathfindingStarInvalidColor</key>
+     <key>PathfindingTestPathInvalidEndColor</key>
     <map>
       <key>Comment</key>
-      <string>yay!</string>
+      <string>Color of the pathfinding test-pathing tool end-point when the path is invalid.</string>
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
@@ -13801,7 +13801,7 @@
 	 <key>PathfindingTestPathColor</key>
     <map>
       <key>Comment</key>
-      <string>yay!</string>
+      <string>Color of the pathfinding test-path when the path is valid.</string>
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
@@ -13817,7 +13817,7 @@
   <key>PathfindingAmbiance</key>
   <map>
     <key>Comment</key>
-    <string>Ambiance of lit pathfinding displays.</string>
+    <string>Ambiance of lit pathfinding navmesh displays.</string>
     <key>Persist</key>
     <integer>0</integer>
     <key>Type</key>
@@ -13829,7 +13829,7 @@
   <key>PathfindingXRayTint</key>
   <map>
     <key>Comment</key>
-    <string>Amount to darken/lighten x-ray lines in pathfinding display</string>
+    <string>Amount to darken/lighten x-ray lines in pathfinding display.</string>
     <key>Persist</key>
     <integer>0</integer>
     <key>Type</key>
@@ -13853,7 +13853,7 @@
   <key>PathfindingXRayWireframe</key>
   <map>
     <key>Comment</key>
-    <string>Render pathfinding xray as a wireframe.</string>
+    <string>Render pathfinding navmesh xray as a wireframe.</string>
     <key>Persist</key>
     <integer>0</integer>
     <key>Type</key>
@@ -13865,7 +13865,7 @@
   <key>PathfindingLineWidth</key>
   <map>
     <key>Comment</key>
-    <string>Width of volume outlines in pathfinding display.</string>
+    <string>Width of volume outlines in pathfinding navmesh display.</string>
     <key>Persist</key>
     <integer>0</integer>
     <key>Type</key>
@@ -13922,7 +13922,7 @@
   <key>PathfindingWaterColor</key>
     <map>
       <key>Comment</key>
-      <string>yay!</string>
+      <string>Color of water plane when displaying pathfinding navmesh.</string>
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index 2cf7f3aeb1..c2d19bfb9a 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -70,7 +70,7 @@
 
 #define SET_SHAPE_RENDER_FLAG(_flag,_type) _flag |= (1U << _type)
 
-#define CONTROL_NAME_RETRIEVE_NEIGHBOR       "RetrieveNeighboringRegion"
+#define CONTROL_NAME_RETRIEVE_NEIGHBOR       "PathfindingRetrieveNeighboringRegion"
 #define CONTROL_NAME_WALKABLE_OBJECTS        "PathfindingWalkable"
 #define CONTROL_NAME_STATIC_OBSTACLE_OBJECTS "PathfindingObstacle"
 #define CONTROL_NAME_MATERIAL_VOLUMES        "PathfindingMaterial"
@@ -80,8 +80,8 @@
 #define CONTROL_NAME_HEATMAP_MIN             "PathfindingHeatColorBase"
 #define CONTROL_NAME_HEATMAP_MAX             "PathfindingHeatColorMax"
 #define CONTROL_NAME_NAVMESH_FACE            "PathfindingFaceColor"
-#define CONTROL_NAME_TEST_PATH_VALID_END     "PathfindingStarValidColor"
-#define CONTROL_NAME_TEST_PATH_INVALID_END   "PathfindingStarInvalidColor"
+#define CONTROL_NAME_TEST_PATH_VALID_END     "PathfindingTestPathValidEndColor"
+#define CONTROL_NAME_TEST_PATH_INVALID_END   "PathfindingTestPathInvalidEndColor"
 #define CONTROL_NAME_TEST_PATH               "PathfindingTestPathColor"
 #define CONTROL_NAME_WATER					 "PathfindingWaterColor"
 
diff --git a/indra/newview/llpathfindingnavmeshzone.cpp b/indra/newview/llpathfindingnavmeshzone.cpp
index d8670062e9..ee81762792 100644
--- a/indra/newview/llpathfindingnavmeshzone.cpp
+++ b/indra/newview/llpathfindingnavmeshzone.cpp
@@ -71,7 +71,7 @@ void LLPathfindingNavMeshZone::initialize()
 	NavMeshLocationPtr centerNavMeshPtr(new NavMeshLocation(CENTER_REGION, boost::bind(&LLPathfindingNavMeshZone::handleNavMeshLocation, this)));
 	mNavMeshLocationPtrs.push_back(centerNavMeshPtr);
 
-	U32 neighborRegionDir = gSavedSettings.getU32("RetrieveNeighboringRegion");
+	U32 neighborRegionDir = gSavedSettings.getU32("PathfindingRetrieveNeighboringRegion");
 	if (neighborRegionDir != CENTER_REGION)
 	{
 		NavMeshLocationPtr neighborNavMeshPtr(new NavMeshLocation(neighborRegionDir, boost::bind(&LLPathfindingNavMeshZone::handleNavMeshLocation, this)));