diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 22dc336399..7d42f237b1 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -155,15 +155,15 @@
            is_running_function="Floater.IsOpen"
            is_running_parameters="people"
            />
-  <command name="pathfinding_console"
+  <command name="pathfinding_setup"
            available_in_toybox="false"
            icon="Command_Pathfinding_Icon"
            label_ref="Command_Pathfinding_Label"
            tooltip_ref="Command_Pathfinding_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
-           execute_parameters="pathfinding_console"
+           execute_parameters="pathfinding_setup"
            is_running_function="Floater.IsOpen"
-           is_running_parameters="pathfinding_console"
+           is_running_parameters="pathfinding_setup"
            />
   <command name="pathfinding_linksets"
            available_in_toybox="false"
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index ba27f3cfc0..837db1550b 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -245,8 +245,8 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("outgoing_call", "floater_outgoing_call.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLOutgoingCallDialog>);
 	LLFloaterPayUtil::registerFloater();
 
-	LLFloaterReg::add("pathfinding_console", "floater_pathfinding_console.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPathfindingSetup>);
 	LLFloaterReg::add("pathfinding_linksets", "floater_pathfinding_linksets.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPathfindingLinksets>);
+	LLFloaterReg::add("pathfinding_setup", "floater_pathfinding_setup.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPathfindingSetup>);
 	LLFloaterReg::add("people", "floater_people.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
 	LLFloaterReg::add("places", "floater_places.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
 	LLFloaterReg::add("preferences", "floater_preferences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreference>);
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index a513dcc65e..487f849ada 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -964,7 +964,7 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window,  LLCoordGL pos, MASK
 		MASK currentKeyMask = gKeyboard->currentMask(TRUE);
 		if ( !(currentKeyMask & MASK_ALT) )
 		{
-			LLFloaterPathfindingSetup* pFloater = LLFloaterReg::getTypedInstance<LLFloaterPathfindingSetup>("pathfinding_console");
+			LLFloaterPathfindingSetup* pFloater = LLFloaterReg::getTypedInstance<LLFloaterPathfindingSetup>("pathfinding_setup");
 			if ( pFloater )
 			{
 				//The floater takes care of determining what stage - essentially where the data goes into the pathing packet(start or end)
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml
similarity index 100%
rename from indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
rename to indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 54477f2cb7..967ea598b8 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -943,7 +943,7 @@
             name="pathfinding_menu_item">
             <menu_item_call.on_click
                 function="Floater.ToggleOrBringToFront"
-                parameter="pathfinding_console" />
+                parameter="pathfinding_setup" />
         </menu_item_call>
 
         <menu_item_separator/>