diff --git a/doc/api/qtcreator-api.qdocconf b/doc/api/qtcreator-api.qdocconf
index bd0212e989c370c1647c6cd631fc8bd087103011..74ff036df9a4b09f0e2021a4f5d144506d7e5713 100644
--- a/doc/api/qtcreator-api.qdocconf
+++ b/doc/api/qtcreator-api.qdocconf
@@ -9,7 +9,7 @@ headerdirs              = . \
                           ../../src/libs/extensionsystem \
                           ../../src/plugins/coreplugin \
                           ../../src/plugins/find \
-                          ../../src/plugins/quickopen
+                          ../../src/plugins/locator
 
 sourcedirs              = . \
                           ../../src/libs/aggregation \
@@ -17,7 +17,7 @@ sourcedirs              = . \
                           ../../src/libs/extensionsystem \
                           ../../src/plugins/coreplugin \
                           ../../src/plugins/find \
-                          ../../src/plugins/quickopen
+                          ../../src/plugins/locator
 
 headers.fileextesnions  = "*.h"
 sources.fileextensions  = "*.cpp *.qdoc"
@@ -62,7 +62,7 @@ macro.endquote                  = "\\endquotation"
 macro.relatesto                 = "\\relates"
 
 spurious			= "Missing comma in .*" \
-				  "Missing pattern .*"
+                                  "Missing pattern .*"
 
 ## macros.qdocconf
 macro.aring.HTML        = "å"
@@ -224,7 +224,7 @@ defines                 = Q_QDOC \
                           Q_WS_.* \
                           Q_OS_.* \
                           Q_BYTE_ORDER \
-			  QT_DEPRECATED \
+                          QT_DEPRECATED \
                           Q_NO_USING_KEYWORD \
                           __cplusplus
 
@@ -232,4 +232,4 @@ defines                 = Q_QDOC \
 # See also qhp.Qt.extraFiles
 extraimages.HTML        = qt-logo \
                           trolltech-logo
-                             
+
diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.h b/src/plugins/cpptools/cppcurrentdocumentfilter.h
index a72a75fea4f25514e0fe3d53ce76e6be9dcd4154..905f1da4fb89d618355777ede8e3061d91043ad5 100644
--- a/src/plugins/cpptools/cppcurrentdocumentfilter.h
+++ b/src/plugins/cpptools/cppcurrentdocumentfilter.h
@@ -30,7 +30,7 @@
 #define CPPCURRENTDOCUMENTFILTER_H
 
 #include "searchsymbols.h"
-#include <quickopen/ilocatorfilter.h>
+#include <locator/ilocatorfilter.h>
 
 namespace Core {
 class EditorManager;
diff --git a/src/plugins/cpptools/cpplocatorfilter.h b/src/plugins/cpptools/cpplocatorfilter.h
index 39dde0f8dc15704fbdd9351712ee22cf11724dd6..c33fcf45ae4193f0be841573145aa13e934bb872 100644
--- a/src/plugins/cpptools/cpplocatorfilter.h
+++ b/src/plugins/cpptools/cpplocatorfilter.h
@@ -32,7 +32,7 @@
 
 #include "searchsymbols.h"
 
-#include <quickopen/ilocatorfilter.h>
+#include <locator/ilocatorfilter.h>
 
 namespace Core {
 class EditorManager;
diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro
index c39ec6f095440b485efec0a29c3de72273db5338..056757f2afd5ce62d84c48e7a7f30dd666c3ae39 100644
--- a/src/plugins/cpptools/cpptools.pro
+++ b/src/plugins/cpptools/cpptools.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 TARGET = CppTools
 include(../../qtcreatorplugin.pri)
-include(../../plugins/quickopen/quickopen.pri)
+include(../../plugins/locator/quickopen.pri)
 include(cpptools_dependencies.pri)
 
 # DEFINES += QT_NO_CAST_FROM_ASCII
diff --git a/src/plugins/help/help_dependencies.pri b/src/plugins/help/help_dependencies.pri
index 2b46febe3b5a232ae6caf2f3d1fc3508ef3777c4..412f99efb6d9d6d83a325ae212bbc14e5d8dc4fc 100644
--- a/src/plugins/help/help_dependencies.pri
+++ b/src/plugins/help/help_dependencies.pri
@@ -1,4 +1,4 @@
 include(../../plugins/coreplugin/coreplugin.pri)
 include(../../plugins/find/find.pri)
-include(../../plugins/quickopen/quickopen.pri)
+include(../../plugins/locator/quickopen.pri)
 
diff --git a/src/plugins/help/helpindexfilter.h b/src/plugins/help/helpindexfilter.h
index 038670792a0548b666a570f95b9b344201076bc5..7094e9adf216ab8f0748fa9feca6d8ea0d09e0eb 100644
--- a/src/plugins/help/helpindexfilter.h
+++ b/src/plugins/help/helpindexfilter.h
@@ -30,7 +30,7 @@
 #ifndef HELPINDEXFILTER_H
 #define HELPINDEXFILTER_H
 
-#include <quickopen/ilocatorfilter.h>
+#include <locator/ilocatorfilter.h>
 
 #include <QtGui/QIcon>
 
diff --git a/src/plugins/quickopen/QuickOpen.pluginspec b/src/plugins/locator/QuickOpen.pluginspec
similarity index 100%
rename from src/plugins/quickopen/QuickOpen.pluginspec
rename to src/plugins/locator/QuickOpen.pluginspec
diff --git a/src/plugins/quickopen/basefilefilter.cpp b/src/plugins/locator/basefilefilter.cpp
similarity index 100%
rename from src/plugins/quickopen/basefilefilter.cpp
rename to src/plugins/locator/basefilefilter.cpp
diff --git a/src/plugins/quickopen/basefilefilter.h b/src/plugins/locator/basefilefilter.h
similarity index 100%
rename from src/plugins/quickopen/basefilefilter.h
rename to src/plugins/locator/basefilefilter.h
diff --git a/src/plugins/quickopen/directoryfilter.cpp b/src/plugins/locator/directoryfilter.cpp
similarity index 100%
rename from src/plugins/quickopen/directoryfilter.cpp
rename to src/plugins/locator/directoryfilter.cpp
diff --git a/src/plugins/quickopen/directoryfilter.h b/src/plugins/locator/directoryfilter.h
similarity index 100%
rename from src/plugins/quickopen/directoryfilter.h
rename to src/plugins/locator/directoryfilter.h
diff --git a/src/plugins/quickopen/directoryfilter.ui b/src/plugins/locator/directoryfilter.ui
similarity index 100%
rename from src/plugins/quickopen/directoryfilter.ui
rename to src/plugins/locator/directoryfilter.ui
diff --git a/src/plugins/quickopen/directoryparser.cpp b/src/plugins/locator/directoryparser.cpp
similarity index 100%
rename from src/plugins/quickopen/directoryparser.cpp
rename to src/plugins/locator/directoryparser.cpp
diff --git a/src/plugins/quickopen/directoryparser.h b/src/plugins/locator/directoryparser.h
similarity index 100%
rename from src/plugins/quickopen/directoryparser.h
rename to src/plugins/locator/directoryparser.h
diff --git a/src/plugins/quickopen/filesystemfilter.cpp b/src/plugins/locator/filesystemfilter.cpp
similarity index 100%
rename from src/plugins/quickopen/filesystemfilter.cpp
rename to src/plugins/locator/filesystemfilter.cpp
diff --git a/src/plugins/quickopen/filesystemfilter.h b/src/plugins/locator/filesystemfilter.h
similarity index 100%
rename from src/plugins/quickopen/filesystemfilter.h
rename to src/plugins/locator/filesystemfilter.h
diff --git a/src/plugins/quickopen/filesystemfilter.ui b/src/plugins/locator/filesystemfilter.ui
similarity index 100%
rename from src/plugins/quickopen/filesystemfilter.ui
rename to src/plugins/locator/filesystemfilter.ui
diff --git a/src/plugins/quickopen/ilocatorfilter.cpp b/src/plugins/locator/ilocatorfilter.cpp
similarity index 100%
rename from src/plugins/quickopen/ilocatorfilter.cpp
rename to src/plugins/locator/ilocatorfilter.cpp
diff --git a/src/plugins/quickopen/ilocatorfilter.h b/src/plugins/locator/ilocatorfilter.h
similarity index 100%
rename from src/plugins/quickopen/ilocatorfilter.h
rename to src/plugins/locator/ilocatorfilter.h
diff --git a/src/plugins/quickopen/images/locator.png b/src/plugins/locator/images/locator.png
similarity index 100%
rename from src/plugins/quickopen/images/locator.png
rename to src/plugins/locator/images/locator.png
diff --git a/src/plugins/quickopen/images/reload.png b/src/plugins/locator/images/reload.png
similarity index 100%
rename from src/plugins/quickopen/images/reload.png
rename to src/plugins/locator/images/reload.png
diff --git a/src/plugins/quickopen/quickopen.pro b/src/plugins/locator/locator.pro
similarity index 100%
rename from src/plugins/quickopen/quickopen.pro
rename to src/plugins/locator/locator.pro
diff --git a/src/plugins/quickopen/locator.qrc b/src/plugins/locator/locator.qrc
similarity index 100%
rename from src/plugins/quickopen/locator.qrc
rename to src/plugins/locator/locator.qrc
diff --git a/src/plugins/quickopen/locator_global.h b/src/plugins/locator/locator_global.h
similarity index 100%
rename from src/plugins/quickopen/locator_global.h
rename to src/plugins/locator/locator_global.h
diff --git a/src/plugins/quickopen/locatorconstants.h b/src/plugins/locator/locatorconstants.h
similarity index 100%
rename from src/plugins/quickopen/locatorconstants.h
rename to src/plugins/locator/locatorconstants.h
diff --git a/src/plugins/quickopen/locatorfiltersfilter.cpp b/src/plugins/locator/locatorfiltersfilter.cpp
similarity index 100%
rename from src/plugins/quickopen/locatorfiltersfilter.cpp
rename to src/plugins/locator/locatorfiltersfilter.cpp
diff --git a/src/plugins/quickopen/locatorfiltersfilter.h b/src/plugins/locator/locatorfiltersfilter.h
similarity index 100%
rename from src/plugins/quickopen/locatorfiltersfilter.h
rename to src/plugins/locator/locatorfiltersfilter.h
diff --git a/src/plugins/quickopen/locatormanager.cpp b/src/plugins/locator/locatormanager.cpp
similarity index 100%
rename from src/plugins/quickopen/locatormanager.cpp
rename to src/plugins/locator/locatormanager.cpp
diff --git a/src/plugins/quickopen/locatormanager.h b/src/plugins/locator/locatormanager.h
similarity index 100%
rename from src/plugins/quickopen/locatormanager.h
rename to src/plugins/locator/locatormanager.h
diff --git a/src/plugins/quickopen/locatorplugin.cpp b/src/plugins/locator/locatorplugin.cpp
similarity index 100%
rename from src/plugins/quickopen/locatorplugin.cpp
rename to src/plugins/locator/locatorplugin.cpp
diff --git a/src/plugins/quickopen/locatorplugin.h b/src/plugins/locator/locatorplugin.h
similarity index 100%
rename from src/plugins/quickopen/locatorplugin.h
rename to src/plugins/locator/locatorplugin.h
diff --git a/src/plugins/quickopen/locatorwidget.cpp b/src/plugins/locator/locatorwidget.cpp
similarity index 100%
rename from src/plugins/quickopen/locatorwidget.cpp
rename to src/plugins/locator/locatorwidget.cpp
diff --git a/src/plugins/quickopen/locatorwidget.h b/src/plugins/locator/locatorwidget.h
similarity index 100%
rename from src/plugins/quickopen/locatorwidget.h
rename to src/plugins/locator/locatorwidget.h
diff --git a/src/plugins/quickopen/opendocumentsfilter.cpp b/src/plugins/locator/opendocumentsfilter.cpp
similarity index 100%
rename from src/plugins/quickopen/opendocumentsfilter.cpp
rename to src/plugins/locator/opendocumentsfilter.cpp
diff --git a/src/plugins/quickopen/opendocumentsfilter.h b/src/plugins/locator/opendocumentsfilter.h
similarity index 100%
rename from src/plugins/quickopen/opendocumentsfilter.h
rename to src/plugins/locator/opendocumentsfilter.h
diff --git a/src/plugins/quickopen/quickopen.cp b/src/plugins/locator/quickopen.cp
similarity index 100%
rename from src/plugins/quickopen/quickopen.cp
rename to src/plugins/locator/quickopen.cp
diff --git a/src/plugins/quickopen/quickopen.pri b/src/plugins/locator/quickopen.pri
similarity index 100%
rename from src/plugins/quickopen/quickopen.pri
rename to src/plugins/locator/quickopen.pri
diff --git a/src/plugins/quickopen/quickopen_dependencies.pri b/src/plugins/locator/quickopen_dependencies.pri
similarity index 100%
rename from src/plugins/quickopen/quickopen_dependencies.pri
rename to src/plugins/locator/quickopen_dependencies.pri
diff --git a/src/plugins/quickopen/settingspage.cpp b/src/plugins/locator/settingspage.cpp
similarity index 100%
rename from src/plugins/quickopen/settingspage.cpp
rename to src/plugins/locator/settingspage.cpp
diff --git a/src/plugins/quickopen/settingspage.h b/src/plugins/locator/settingspage.h
similarity index 100%
rename from src/plugins/quickopen/settingspage.h
rename to src/plugins/locator/settingspage.h
diff --git a/src/plugins/quickopen/settingspage.ui b/src/plugins/locator/settingspage.ui
similarity index 100%
rename from src/plugins/quickopen/settingspage.ui
rename to src/plugins/locator/settingspage.ui
diff --git a/src/plugins/quickopen/settingswidget.ui b/src/plugins/locator/settingswidget.ui
similarity index 100%
rename from src/plugins/quickopen/settingswidget.ui
rename to src/plugins/locator/settingswidget.ui
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 44c0ddd032b022a5e9b9a24892ed37e1eb2d4306..c74bda15a2abbaccc25408e3b96ba4dca4853a4e 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -19,7 +19,7 @@ SUBDIRS   = plugin_coreplugin \
             plugin_cpptools \
             plugin_qt4projectmanager \
 #            plugin_snippets \ # buggy and annoying
-            plugin_quickopen \
+            plugin_locator \
             plugin_debugger \
 #            plugin_qtestlib \ # this seems to be dead
 #            plugin_helloworld \ # sample plugin
@@ -46,7 +46,7 @@ plugin_find.depends += plugin_coreplugin
 
 plugin_texteditor.subdir = texteditor
 plugin_texteditor.depends = plugin_find
-plugin_texteditor.depends += plugin_quickopen
+plugin_texteditor.depends += plugin_locator
 plugin_texteditor.depends += plugin_coreplugin
 
 plugin_cppeditor.subdir = cppeditor
@@ -88,7 +88,7 @@ plugin_subversion.depends += plugin_projectexplorer
 plugin_subversion.depends += plugin_coreplugin
 
 plugin_projectexplorer.subdir = projectexplorer
-plugin_projectexplorer.depends = plugin_quickopen
+plugin_projectexplorer.depends = plugin_locator
 plugin_projectexplorer.depends += plugin_find
 plugin_projectexplorer.depends += plugin_coreplugin
 plugin_projectexplorer.depends += plugin_texteditor
@@ -102,8 +102,8 @@ plugin_qt4projectmanager.depends += plugin_help
 plugin_qt4projectmanager.depends += plugin_designer
 plugin_qt4projectmanager.depends += plugin_debugger
 
-plugin_quickopen.subdir = quickopen
-plugin_quickopen.depends = plugin_coreplugin
+plugin_locator.subdir = locator
+plugin_locator.depends = plugin_coreplugin
 
 plugin_cpptools.subdir = cpptools
 plugin_cpptools.depends = plugin_projectexplorer
@@ -139,7 +139,7 @@ plugin_helloworld.depends = plugin_coreplugin
 
 plugin_help.subdir = help
 plugin_help.depends = plugin_find
-plugin_help.depends += plugin_quickopen
+plugin_help.depends += plugin_locator
 plugin_help.depends += plugin_coreplugin
 
 plugin_resourceeditor.subdir = resourceeditor
diff --git a/src/plugins/projectexplorer/allprojectsfilter.h b/src/plugins/projectexplorer/allprojectsfilter.h
index 71b948b6f0de3c083c322e5cd763258dedcfdc8f..9d2455e560051c1b49c1cfddc370b40df04d292b 100644
--- a/src/plugins/projectexplorer/allprojectsfilter.h
+++ b/src/plugins/projectexplorer/allprojectsfilter.h
@@ -30,7 +30,7 @@
 #ifndef ALLPROJECTSFILTER_H
 #define ALLPROJECTSFILTER_H
 
-#include <quickopen/basefilefilter.h>
+#include <locator/basefilefilter.h>
 
 #include <QtCore/QFutureInterface>
 #include <QtCore/QString>
diff --git a/src/plugins/projectexplorer/currentprojectfilter.h b/src/plugins/projectexplorer/currentprojectfilter.h
index 1d9d3fcee09b8fb4d876ca76e36967aca2d96197..aefc8f58189300f323fa9fe5906f74a56916c5d9 100644
--- a/src/plugins/projectexplorer/currentprojectfilter.h
+++ b/src/plugins/projectexplorer/currentprojectfilter.h
@@ -30,7 +30,7 @@
 #ifndef CURRENTPROJECTFILTER_H
 #define CURRENTPROJECTFILTER_H
 
-#include <quickopen/basefilefilter.h>
+#include <locator/basefilefilter.h>
 
 #include <QtCore/QString>
 #include <QtCore/QByteArray>
diff --git a/src/plugins/projectexplorer/projectexplorer_dependencies.pri b/src/plugins/projectexplorer/projectexplorer_dependencies.pri
index 674c8bbb362f8727a5284f915e046a8db44f538a..99d163d6f1b3b3667e00400b86a9a960f2ad65d6 100644
--- a/src/plugins/projectexplorer/projectexplorer_dependencies.pri
+++ b/src/plugins/projectexplorer/projectexplorer_dependencies.pri
@@ -1,5 +1,5 @@
 include(../../libs/utils/utils.pri)
-include(../../plugins/quickopen/quickopen.pri)
+include(../../plugins/locator/quickopen.pri)
 include(../../plugins/find/find.pri)
 include(../../plugins/coreplugin/coreplugin.pri)
 include(../../plugins/texteditor/texteditor.pri)
diff --git a/src/plugins/texteditor/linenumberfilter.h b/src/plugins/texteditor/linenumberfilter.h
index 9147908eed12c0a712071f2e9e0756e2e236fa05..54bb858bfe77e5bcc04916df054cca769ec89bb2 100644
--- a/src/plugins/texteditor/linenumberfilter.h
+++ b/src/plugins/texteditor/linenumberfilter.h
@@ -30,7 +30,7 @@
 #ifndef LINENUMBERFILTER_H
 #define LINENUMBERFILTER_H
 
-#include <quickopen/ilocatorfilter.h>
+#include <locator/ilocatorfilter.h>
 
 #include <QtCore/QString>
 #include <QtCore/QList>
diff --git a/src/plugins/texteditor/texteditor_dependencies.pri b/src/plugins/texteditor/texteditor_dependencies.pri
index 87f23e9eedea6862618f6af9afb6bfb2ee352005..60c22f84776638c62ed4a8cd0f9e943a91a3d48a 100644
--- a/src/plugins/texteditor/texteditor_dependencies.pri
+++ b/src/plugins/texteditor/texteditor_dependencies.pri
@@ -1,4 +1,4 @@
 include(../../libs/utils/utils.pri)
 include(../../plugins/find/find.pri)
-include(../../plugins/quickopen/quickopen.pri)
+include(../../plugins/locator/quickopen.pri)
 include(../../plugins/coreplugin/coreplugin.pri)
diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp
index ffa93436871c793af5baffcb1ef53ca0ee0cf57e..5043583a469ff491203b72fe8922c7afc0193e4b 100644
--- a/src/plugins/texteditor/texteditoractionhandler.cpp
+++ b/src/plugins/texteditor/texteditoractionhandler.cpp
@@ -33,7 +33,7 @@
 #include "texteditorplugin.h"
 #include "linenumberfilter.h"
 
-#include <quickopen/locatormanager.h>
+#include <locator/locatormanager.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/uniqueidmanager.h>