diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 76aa982f1dd608c84550992f916e2bcacc3ede8c..45688a17241a4ad8604ad11ebb87eb6d76b6c1fa 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -219,8 +219,8 @@ set(viewer_SOURCE_FILES
     llfloateropenobject.cpp
     llfloateroutbox.cpp
     llfloaterpathfindingcharacters.cpp
+    llfloaterpathfindingconsole.cpp
     llfloaterpathfindinglinksets.cpp
-    llfloaterpathfindingsetup.cpp
     llfloaterpay.cpp
     llfloaterperms.cpp
     llfloaterpostprocess.cpp
@@ -782,8 +782,8 @@ set(viewer_HEADER_FILES
     llfloateropenobject.h
     llfloateroutbox.h
     llfloaterpathfindingcharacters.h
+    llfloaterpathfindingconsole.h
     llfloaterpathfindinglinksets.h
-    llfloaterpathfindingsetup.h
     llfloaterpay.h
     llfloaterperms.h
     llfloaterpostprocess.h
diff --git a/indra/newview/llfloaterpathfindingsetup.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
similarity index 99%
rename from indra/newview/llfloaterpathfindingsetup.cpp
rename to indra/newview/llfloaterpathfindingconsole.cpp
index dc8e96eb536235a9de0f5a8e7fe91a64193f3e8e..35f56a5625f6490ea1c89b4fa39247d53b68d0bc 100644
--- a/indra/newview/llfloaterpathfindingsetup.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -26,7 +26,7 @@
 */
 
 #include "llviewerprecompiledheaders.h"
-#include "llfloaterpathfindingsetup.h"
+#include "llfloaterpathfindingconsole.h"
 #include "llfloaterpathfindinglinksets.h"
 
 #include "llsd.h"
diff --git a/indra/newview/llfloaterpathfindingsetup.h b/indra/newview/llfloaterpathfindingconsole.h
similarity index 100%
rename from indra/newview/llfloaterpathfindingsetup.h
rename to indra/newview/llfloaterpathfindingconsole.h
diff --git a/indra/newview/llnavmeshstation.cpp b/indra/newview/llnavmeshstation.cpp
index 16f459ff84876362d00e4fc7a0299efad4068d66..87f7e92ddd19143388e3cd6720f2b7dd0a67f438 100644
--- a/indra/newview/llnavmeshstation.cpp
+++ b/indra/newview/llnavmeshstation.cpp
@@ -31,7 +31,7 @@
 #include "llagent.h"
 #include "llviewerregion.h"
 #include "llsdutil.h"
-#include "llfloaterpathfindingsetup.h"
+#include "llfloaterpathfindingconsole.h"
 
 //===============================================================================
 LLNavMeshStation::LLNavMeshStation()
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 719f560101ec69d0973afbc8e7c5ec36b20a85f4..3e21334cd4ad3228f0e6556d0f5cf00ed1cd92a2 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -78,7 +78,7 @@
 #include "llwaterparammanager.h"
 #include "llpostprocess.h"
 #include "LLPathingLib.h"
-#include "llfloaterpathfindingsetup.h"
+#include "llfloaterpathfindingconsole.h"
 #include "llfloaterreg.h"
 
 extern LLPointer<LLViewerTexture> gStartTexture;
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 84a0a8c6c45e0d7b1de7a1f8ab50db732633cde1..e4d17e9d256da19303617af83b832629078818f8 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -86,7 +86,7 @@
 #include "llfloateroutbox.h"
 #include "llfloaterpathfindingcharacters.h"
 #include "llfloaterpathfindinglinksets.h"
-#include "llfloaterpathfindingsetup.h"
+#include "llfloaterpathfindingconsole.h"
 #include "llfloaterpay.h"
 #include "llfloaterperms.h"
 #include "llfloaterpostprocess.h"
@@ -248,7 +248,7 @@ void LLViewerFloaterReg::registerFloaters()
 
 	LLFloaterReg::add("pathfinding_characters", "floater_pathfinding_characters.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPathfindingCharacters>);
 	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("pathfinding_setup", "floater_pathfinding_console.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 04b687b42f24eab5610a071464fda5334cb3efa4..9109b5379b5c444d36a170c18eff32be968d1396 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -204,7 +204,7 @@
 #include "llviewerwindowlistener.h"
 #include "llpaneltopinfobar.h"
 #include "LLPathingLib.h"
-#include "llfloaterpathfindingsetup.h"
+#include "llfloaterpathfindingconsole.h"
 
 #if LL_WINDOWS
 #include <tchar.h> // For Unicode conversion methods
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
similarity index 100%
rename from indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml
rename to indra/newview/skins/default/xui/en/floater_pathfinding_console.xml