diff --git a/doc/api/qtcreator-api.qdoc b/doc/api/qtcreator-api.qdoc
index a71eadce7b50ea2811380e9b1367d61e9e21344d..b1760846ffe7e53f0ecc81c658ac33b1994bcdf0 100644
--- a/doc/api/qtcreator-api.qdoc
+++ b/doc/api/qtcreator-api.qdoc
@@ -54,7 +54,7 @@
     \o Support for searching text in arbitrary widgets, and arbitrary other things.
 
     \row
-    \o \l{QuickOpen}
+    \o \l{Locator}
     \o Hooks for providing content for Locator.
 
     \endtable
@@ -162,7 +162,7 @@
     \row
     \o Add a new filter to Locator.
     \o For a text typed in by the user you provide a list of things to show in the popup. When the user selects an entry you are requested to do whatever you want.
-    \o \l{QuickOpen::IQuickOpenFilter}, \l{QuickOpen::FilterEntry}, \l{QuickOpen::BaseFileFilter}
+    \o \l{Locator::ILocatorFilter}, \l{Locator::FilterEntry}, \l{Locator::BaseFileFilter}
 
     \row
     \o
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/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index ca905d5a1f4bc144c3261cd7d546e0aa16edac42..9b57adaf1f7b493570116cc33fe3ffb9266570e3 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -2582,9 +2582,9 @@ Sollen sie überschrieben werden?</translation>
     </message>
 </context>
 <context>
-    <name>CppTools::Internal::CppQuickOpenFilter</name>
+    <name>CppTools::Internal::CppLocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppquickopenfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/cpptools/cpplocatorfilter.h" line="+53"/>
         <source>Classes and Methods</source>
         <translation>Klassen und Methoden</translation>
     </message>
@@ -7583,7 +7583,7 @@ Grund: %3</translation>
 <context>
     <name>Locator</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenconstants.h" line="+38"/>
+        <location filename="../../../src/plugins/locator/locatorconstants.h" line="+38"/>
         <source>Filters</source>
         <translation>Filter</translation>
     </message>
@@ -12601,9 +12601,9 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung &apos;TRK&apos;
     </message>
 </context>
 <context>
-    <name>QuickOpen::IQuickOpenFilter</name>
+    <name>Locator::ILocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/iquickopenfilter.cpp" line="+86"/>
+        <location filename="../../../src/plugins/locator/ilocatorfilter.cpp" line="+86"/>
         <source>Filter Configuration</source>
         <translation>Filterkonfiguration</translation>
     </message>
@@ -12619,9 +12619,9 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung &apos;TRK&apos;
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilter</name>
+    <name>Locator::Internal::DirectoryFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.cpp" line="+44"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.cpp" line="+44"/>
         <source>Generic Directory Filter</source>
         <translation>Allgemeines Verzeichnisfilter</translation>
     </message>
@@ -12656,9 +12656,9 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung &apos;TRK&apos;
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilterOptions</name>
+    <name>Locator::Internal::DirectoryFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.ui"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.ui"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
@@ -12711,17 +12711,17 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt  von einem Leerzeich
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilter</name>
+    <name>Locator::Internal::FileSystemFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.h" line="+54"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.h" line="+54"/>
         <source>Files in file system</source>
         <translation>Dateien aus dem Dateisystem</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilterOptions</name>
+    <name>Locator::Internal::FileSystemFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.ui"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.ui"/>
         <source>Filter configuration</source>
         <translation>Filterkonfiguration</translation>
     </message>
@@ -12747,33 +12747,33 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt  von einem Leerzeich
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::OpenDocumentsFilter</name>
+    <name>Locator::Internal::OpenDocumentsFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/opendocumentsfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/locator/opendocumentsfilter.h" line="+53"/>
         <source>Open documents</source>
         <translation>Offene Dokumente</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenFiltersFilter</name>
+    <name>Locator::Internal::LocatorFiltersFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenfiltersfilter.cpp" line="+53"/>
+        <location filename="../../../src/plugins/locator/locatorfiltersfilter.cpp" line="+53"/>
         <source>Available filters</source>
         <translation>Verfügbare Filter</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenPlugin</name>
+    <name>Locator::Internal::LocatorPlugin</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenplugin.cpp" line="+247"/>
+        <location filename="../../../src/plugins/locator/locatorplugin.cpp" line="+247"/>
         <source>Indexing</source>
         <translation>Indizierung</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenToolWindow</name>
+    <name>Locator::Internal::LocatorWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopentoolwindow.cpp" line="+254"/>
+        <location filename="../../../src/plugins/locator/locatorwidget.cpp" line="+254"/>
         <source>Refresh</source>
         <translation>Aktualisieren</translation>
     </message>
@@ -12799,9 +12799,9 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt  von einem Leerzeich
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsDialog</name>
+    <name>Locator::Internal::SettingsDialog</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingswidget.ui"/>
+        <location filename="../../../src/plugins/locator/settingswidget.ui"/>
         <source>Configure Filters</source>
         <translation>Filter konfigurieren</translation>
     </message>
@@ -12837,17 +12837,17 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt  von einem Leerzeich
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsPage</name>
+    <name>Locator::Internal::SettingsPage</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.cpp" line="+159"/>
+        <location filename="../../../src/plugins/locator/settingspage.cpp" line="+159"/>
         <source>%1 (Prefix: %2)</source>
         <translation>%1 (Präfix: %2)</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsWidget</name>
+    <name>Locator::Internal::SettingsWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.ui"/>
+        <location filename="../../../src/plugins/locator/settingspage.ui"/>
         <source>Configure Filters</source>
         <translation>Filterkonfiguration</translation>
     </message>
diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts
index 6511ae016e395c306c28084a4bcadebdb646ac56..d8b324365138bee6812c1e675d25790702fcc256 100644
--- a/share/qtcreator/translations/qtcreator_es.ts
+++ b/share/qtcreator/translations/qtcreator_es.ts
@@ -2835,9 +2835,9 @@ Would you like to overwrite them?</source>
     </message>
 </context>
 <context>
-    <name>CppTools::Internal::CppQuickOpenFilter</name>
+    <name>CppTools::Internal::CppLocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppquickopenfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/cpptools/cpplocatorfilter.h" line="+53"/>
         <source>Classes and Methods</source>
         <translation>Clases y métodos</translation>
     </message>
@@ -7791,7 +7791,7 @@ Skipping file.</source>
 <context>
     <name>Locator</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenconstants.h" line="+38"/>
+        <location filename="../../../src/plugins/locator/locatorconstants.h" line="+38"/>
         <source>Filters</source>
         <translation>Filtros</translation>
     </message>
@@ -11581,9 +11581,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::IQuickOpenFilter</name>
+    <name>Locator::ILocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/iquickopenfilter.cpp" line="+86"/>
+        <location filename="../../../src/plugins/locator/ilocatorfilter.cpp" line="+86"/>
         <source>Filter Configuration</source>
         <translation>Filtro de configuración</translation>
     </message>
@@ -11599,9 +11599,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilter</name>
+    <name>Locator::Internal::DirectoryFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.cpp" line="+44"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.cpp" line="+44"/>
         <source>Generic Directory Filter</source>
         <translation>Filtro genérico de directorios</translation>
     </message>
@@ -11636,9 +11636,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilterOptions</name>
+    <name>Locator::Internal::DirectoryFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.ui"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.ui"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
@@ -11691,17 +11691,17 @@ Para hacerlo, introduzca el atajo y un espacio en el campo Localización, y lueg
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilter</name>
+    <name>Locator::Internal::FileSystemFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.h" line="+54"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.h" line="+54"/>
         <source>Files in file system</source>
         <translation>Archivos en el sistema de archivos</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilterOptions</name>
+    <name>Locator::Internal::FileSystemFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.ui"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.ui"/>
         <source>Filter configuration</source>
         <translation>Ajustes de filtros</translation>
     </message>
@@ -11727,33 +11727,33 @@ Para hacerlo, introduzca el atajo y un espacio en el campo Localización, y lueg
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::OpenDocumentsFilter</name>
+    <name>Locator::Internal::OpenDocumentsFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/opendocumentsfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/locator/opendocumentsfilter.h" line="+53"/>
         <source>Open documents</source>
         <translation>Documentos abiertos</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenFiltersFilter</name>
+    <name>Locator::Internal::LocatorFiltersFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenfiltersfilter.cpp" line="+53"/>
+        <location filename="../../../src/plugins/locator/locatorfiltersfilter.cpp" line="+53"/>
         <source>Available filters</source>
         <translation>Filtros disponibles</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenPlugin</name>
+    <name>Locator::Internal::LocatorPlugin</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenplugin.cpp" line="+247"/>
+        <location filename="../../../src/plugins/locator/locatorplugin.cpp" line="+247"/>
         <source>Indexing</source>
         <translation>Indizando</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenToolWindow</name>
+    <name>Locator::Internal::LocatorWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopentoolwindow.cpp" line="+254"/>
+        <location filename="../../../src/plugins/locator/locatorwidget.cpp" line="+254"/>
         <source>Refresh</source>
         <translation>Refrescar</translation>
     </message>
@@ -11779,9 +11779,9 @@ Para hacerlo, introduzca el atajo y un espacio en el campo Localización, y lueg
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsDialog</name>
+    <name>Locator::Internal::SettingsDialog</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingswidget.ui"/>
+        <location filename="../../../src/plugins/locator/settingswidget.ui"/>
         <source>Configure Filters</source>
         <translation>Ajustar filtros</translation>
     </message>
@@ -11817,17 +11817,17 @@ Para hacerlo, introduzca el atajo y un espacio en el campo Localización, y lueg
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsPage</name>
+    <name>Locator::Internal::SettingsPage</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.cpp" line="+159"/>
+        <location filename="../../../src/plugins/locator/settingspage.cpp" line="+159"/>
         <source>%1 (Prefix: %2)</source>
         <translation>%1 (Prefijo: %2)</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsWidget</name>
+    <name>Locator::Internal::SettingsWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.ui"/>
+        <location filename="../../../src/plugins/locator/settingspage.ui"/>
         <source>Configure Filters</source>
         <translation>Ajustar filtros</translation>
     </message>
@@ -12885,7 +12885,7 @@ Para hacerlo, introduzca el atajo y un espacio en el campo Localización, y lueg
     </message>
     <message>
         <source>
-	This is only an example.</source>
+        This is only an example.</source>
         <translation type="obsolete">Esto es simplemente un ejemplo.</translation>
     </message>
 </context>
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index afbd79e2b742db3b99ea16e7c4bca1243199a27a..e77be508a0ca569a4e3f674489ed6cacb5a0a69c 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -7,7 +7,7 @@
         <location filename="../../../src/app/main.cpp" line="+147"/>
         <source>Failed to load core: %1</source>
         <translatorcomment>traduire core ?</translatorcomment>
-        <translation type="unfinished">Échec dans le chargement du core : %1</translation>
+        <translation type="unfinished">Échec dans le chargement du core : %1</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -39,13 +39,13 @@
     <message>
         <location/>
         <source>Executable:</source>
-        <translation>Exécutable :</translation>
+        <translation>Exécutable :</translation>
     </message>
     <message>
         <location/>
         <source>Core File:</source>
         <translatorcomment>&apos;core&apos; encore...</translatorcomment>
-        <translation type="unfinished">Fichier Core :</translation>
+        <translation type="unfinished">Fichier Core :</translation>
     </message>
 </context>
 <context>
@@ -59,12 +59,12 @@
         <location/>
         <source>Attach to Process ID:</source>
         <translatorcomment>PID ?</translatorcomment>
-        <translation type="unfinished">Attacher au processus d&apos;ID :</translation>
+        <translation type="unfinished">Attacher au processus d&apos;ID :</translation>
     </message>
     <message>
         <location/>
         <source>Filter:</source>
-        <translation>Filtre :</translation>
+        <translation>Filtre :</translation>
     </message>
     <message>
         <location/>
@@ -80,19 +80,19 @@
     </message>
     <message>
         <source>Host and port:</source>
-        <translation type="obsolete">Hôte et port :</translation>
+        <translation type="obsolete">Hôte et port :</translation>
     </message>
     <message>
         <source>Architecture:</source>
-        <translation type="obsolete">Architecture :</translation>
+        <translation type="obsolete">Architecture :</translation>
     </message>
     <message>
         <source>Use server start script:</source>
-        <translation type="obsolete">Utiliser le script de démarrage du serveur :</translation>
+        <translation type="obsolete">Utiliser le script de démarrage du serveur :</translation>
     </message>
     <message>
         <source>Server start script:</source>
-        <translation type="obsolete">Script de démarrage du serveur :</translation>
+        <translation type="obsolete">Script de démarrage du serveur :</translation>
     </message>
 </context>
 <context>
@@ -118,12 +118,12 @@
     <message>
         <location/>
         <source>Bookmark:</source>
-        <translation>Signet :</translation>
+        <translation>Signet :</translation>
     </message>
     <message>
         <location/>
         <source>Add in Folder:</source>
-        <translation>Ajouter dans le dossier :</translation>
+        <translation>Ajouter dans le dossier :</translation>
     </message>
     <message>
         <location/>
@@ -218,7 +218,7 @@
     <message>
         <location line="+38"/>
         <source>Filter:</source>
-        <translation>Filtre :</translation>
+        <translation>Filtre :</translation>
     </message>
     <message>
         <location line="+26"/>
@@ -334,7 +334,7 @@
     <message>
         <location/>
         <source>Function to break on:</source>
-        <translation>Fonction à interrompre :</translation>
+        <translation>Fonction à interrompre :</translation>
     </message>
 </context>
 <context>
@@ -342,7 +342,7 @@
     <message>
         <location filename="../../../src/plugins/debugger/breakcondition.ui"/>
         <source>Condition:</source>
-        <translation>Condition :</translation>
+        <translation>Condition :</translation>
     </message>
     <message>
         <location/>
@@ -402,7 +402,7 @@
     <message>
         <location filename="../../../src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp" line="+247"/>
         <source>Arguments:</source>
-        <translation>Arguments :</translation>
+        <translation>Arguments :</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -417,7 +417,7 @@
     <message>
         <location line="+7"/>
         <source>Working Directory:</source>
-        <translation>Répertoire de travail :</translation>
+        <translation>Répertoire de travail :</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -451,7 +451,7 @@
     <message>
         <location line="-97"/>
         <source>Base environment for this runconfiguration:</source>
-        <translation>Environnement de base pour cette configuration d&apos;éxecution :</translation>
+        <translation>Environnement de base pour cette configuration d&apos;éxecution :</translation>
     </message>
 </context>
 <context>
@@ -563,12 +563,12 @@
     <message>
         <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="+163"/>
         <source>Additional arguments:</source>
-        <translation type="unfinished">Arguments supplémentaires :</translation>
+        <translation type="unfinished">Arguments supplémentaires :</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Targets:</source>
-        <translation type="unfinished">Cibles :</translation>
+        <translation type="unfinished">Cibles :</translation>
     </message>
     <message>
         <location line="+59"/>
@@ -591,7 +591,7 @@
     <message>
         <location line="+8"/>
         <source>Build directory:</source>
-        <translation type="unfinished">Répertoire de compilation :</translation>
+        <translation type="unfinished">Répertoire de compilation :</translation>
     </message>
 </context>
 <context>
@@ -630,7 +630,7 @@
     <message>
         <location/>
         <source>Path:</source>
-        <translation>Chemin :</translation>
+        <translation>Chemin :</translation>
     </message>
     <message>
         <location/>
@@ -640,12 +640,12 @@
     <message>
         <location/>
         <source>Symbol paths:</source>
-        <translation type="unfinished">Chemins des symboles :</translation>
+        <translation type="unfinished">Chemins des symboles :</translation>
     </message>
     <message>
         <location/>
         <source>Source paths:</source>
-        <translation type="unfinished">Chemins des sources :</translation>
+        <translation type="unfinished">Chemins des sources :</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/debugger/cdb/cdboptionspage.cpp" line="+58"/>
@@ -679,7 +679,7 @@
     <message>
         <location filename="../../../src/plugins/git/changeselectiondialog.ui"/>
         <source>Repository Location:</source>
-        <translation>Adresse du depôt :</translation>
+        <translation>Adresse du depôt :</translation>
     </message>
     <message>
         <location/>
@@ -689,7 +689,7 @@
     <message>
         <location/>
         <source>Change:</source>
-        <translation>Modification :</translation>
+        <translation>Modification :</translation>
     </message>
 </context>
 <context>
@@ -758,7 +758,7 @@
         <location filename="../../../src/plugins/cpaster/pasteselect.ui"/>
         <source>Paste:</source>
         <translatorcomment>quelque chose de plus français pour la référence de paste?</translatorcomment>
-        <translation type="unfinished">Collage :</translation>
+        <translation type="unfinished">Collage :</translation>
     </message>
     <message>
         <location/>
@@ -776,12 +776,12 @@
     </message>
     <message>
         <source>CodePaster Server:</source>
-        <translation type="obsolete">Serveur CodePaster :</translation>
+        <translation type="obsolete">Serveur CodePaster :</translation>
     </message>
     <message>
         <location/>
         <source>Username:</source>
-        <translation>Nom d&apos;utilisateur :</translation>
+        <translation>Nom d&apos;utilisateur :</translation>
     </message>
     <message>
         <location/>
@@ -851,7 +851,7 @@
     </message>
     <message>
         <source>Checking this will enable tooltips for variable values during debugging. Since this can slow down debugging and does not provide reliable information as it does not use scope information, it is switched off by default.</source>
-        <translatorcomment>shunté le coup de la &quot;scope information&quot;... :/</translatorcomment>
+        <translatorcomment>shunté le coup de la &quot;scope information&quot;... :/</translatorcomment>
         <translation type="obsolete">Active les info-bulles sur les variables pendant le déboguage. Comme ceci peut ralentir le déboguage et ne fournit pas nécessairement des valeurs fiables, cette option est désactivée par défault.</translation>
     </message>
     <message>
@@ -866,7 +866,7 @@
     <message>
         <location/>
         <source>Maximal stack depth:</source>
-        <translation>Profondeur maximale de la pile :</translation>
+        <translation>Profondeur maximale de la pile :</translation>
     </message>
     <message>
         <location/>
@@ -945,12 +945,12 @@
     <message>
         <location line="+12"/>
         <source>Unable to open %1 for writing: %2</source>
-        <translation type="unfinished">Impossible d&apos;ouvrir %1 pour écrire : %2</translation>
+        <translation type="unfinished">Impossible d&apos;ouvrir %1 pour écrire : %2</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Error while writing to %1: %2</source>
-        <translation type="unfinished">Erreur pendant l&apos;écriture de %1 : %2</translation>
+        <translation type="unfinished">Erreur pendant l&apos;écriture de %1 : %2</translation>
     </message>
     <message>
         <location line="+296"/>
@@ -990,7 +990,7 @@
         <location line="+34"/>
         <source>The project directory %1 contains files which cannot be overwritten:
 %2.</source>
-        <translation type="unfinished">Le répertoire du projet %1 contient des fichiers qui ne peuvent être écrasés :
+        <translation type="unfinished">Le répertoire du projet %1 contient des fichiers qui ne peuvent être écrasés :
 %2.</translation>
     </message>
     <message>
@@ -998,7 +998,7 @@
         <source>The following files already exist in the directory %1:
 %2.
 Would you like to overwrite them?</source>
-        <translation type="unfinished">Les fichiers suivants existent déjà dans le répertoire %1 :
+        <translation type="unfinished">Les fichiers suivants existent déjà dans le répertoire %1 :
 %2,
 Voulez vous les écraser?</translation>
     </message>
@@ -1465,7 +1465,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location/>
         <source>User &amp;interface color:</source>
-        <translation type="unfinished">Couleur de l&apos;&amp;interface utilisateur :</translation>
+        <translation type="unfinished">Couleur de l&apos;&amp;interface utilisateur :</translation>
     </message>
     <message>
         <location/>
@@ -1480,12 +1480,12 @@ Voulez vous les écraser?</translation>
     <message>
         <location/>
         <source>Terminal:</source>
-        <translation type="unfinished">Terminal :</translation>
+        <translation type="unfinished">Terminal :</translation>
     </message>
     <message>
         <location/>
         <source>External editor:</source>
-        <translation type="unfinished">Éditeur externe :</translation>
+        <translation type="unfinished">Éditeur externe :</translation>
     </message>
     <message>
         <location/>
@@ -1823,7 +1823,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location filename="../../../src/plugins/coreplugin/dialogs/openwithdialog.cpp" line="+43"/>
         <source>Open file &apos;%1&apos; with:</source>
-        <translation>Ouvrir le fichier %1 avec :</translation>
+        <translation>Ouvrir le fichier %1 avec :</translation>
     </message>
 </context>
 <context>
@@ -2138,7 +2138,7 @@ Voulez vous les écraser?</translation>
         <location filename="../../../src/plugins/coreplugin/scriptmanager/scriptmanager.cpp" line="+228"/>
         <source>Exception at line %1: %2
 %3</source>
-        <translation type="unfinished">Exception à la ligne %1 : %2
+        <translation type="unfinished">Exception à la ligne %1 : %2
 %3</translation>
     </message>
     <message>
@@ -2196,7 +2196,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location filename="../../../src/libs/utils/consoleprocess.cpp" line="+49"/>
         <source>Cannot set up communication channel: %1</source>
-        <translation>Impossible d&apos;établir le canal de communication : %1</translation>
+        <translation>Impossible d&apos;établir le canal de communication : %1</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2206,12 +2206,12 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+5"/>
         <source>Cannot create temporary file: %1</source>
-        <translation>Impossible de créer un fichier temporaire : %1</translation>
+        <translation>Impossible de créer un fichier temporaire : %1</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Cannot create temporary directory &apos;%1&apos;: %2</source>
-        <translation>Impossible de créer un dossier temporaire &apos;%1&apos; : %2</translation>
+        <translation>Impossible de créer un dossier temporaire &apos;%1&apos; : %2</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -2221,7 +2221,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+5"/>
         <source>Cannot change to working directory &apos;%1&apos;: %2</source>
-        <translation type="unfinished">Impossible de changer le répertoire de travail &apos;%1&apos; : %2</translation>
+        <translation type="unfinished">Impossible de changer le répertoire de travail &apos;%1&apos; : %2</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -2241,17 +2241,17 @@ Voulez vous les écraser?</translation>
     <message>
         <location filename="../../../src/libs/utils/consoleprocess_win.cpp" line="+125"/>
         <source>The process &apos;%1&apos; could not be started: %2</source>
-        <translation type="unfinished">Le processus &apos;%1&apos; ne peut pas être démarré : %2</translation>
+        <translation type="unfinished">Le processus &apos;%1&apos; ne peut pas être démarré : %2</translation>
     </message>
     <message>
         <location line="+70"/>
         <source>Cannot obtain a handle to the inferior: %1</source>
-        <translation type="unfinished">Impossible d&apos;obtenir le descripteur du processus : %1</translation>
+        <translation type="unfinished">Impossible d&apos;obtenir le descripteur du processus : %1</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Cannot obtain exit status from inferior: %1</source>
-        <translation type="unfinished">Impossible d&apos;obtenir la valeur de retour du processus : %1</translation>
+        <translation type="unfinished">Impossible d&apos;obtenir la valeur de retour du processus : %1</translation>
     </message>
 </context>
 <context>
@@ -2264,7 +2264,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+8"/>
         <source>The name must not contain any of the characters &apos;%1&apos;.</source>
-        <translation>Le nom ne peut pas contenir un des caractères suivant : &apos;%1&apos;.</translation>
+        <translation>Le nom ne peut pas contenir un des caractères suivant : &apos;%1&apos;.</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -2283,24 +2283,24 @@ Voulez vous les écraser?</translation>
         <location filename="../../../src/libs/utils/filesearch.cpp" line="+47"/>
         <source>%1: canceled. %n occurrences found in %2 files.</source>
         <translation>
-            <numerusform>%1 : annulé. %n entrée trouvée dans %2 fichiers.</numerusform>
-            <numerusform>%1 : annulé. %n entrées trouvées dans %2 fichiers.</numerusform>
+            <numerusform>%1 : annulé. %n entrée trouvée dans %2 fichiers.</numerusform>
+            <numerusform>%1 : annulé. %n entrées trouvées dans %2 fichiers.</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location line="+8"/>
         <source>%1: %n occurrences found in %2 files.</source>
         <translation>
-            <numerusform>%1 : %n occurrence trouvée dans %2 fichiers.</numerusform>
-            <numerusform>%1 : %n occurrences trouvées dans %2 fichiers.</numerusform>
+            <numerusform>%1 : %n occurrence trouvée dans %2 fichiers.</numerusform>
+            <numerusform>%1 : %n occurrences trouvées dans %2 fichiers.</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location line="+8"/>
         <source>%1: %n occurrences found in %2 of %3 files.</source>
         <translation>
-            <numerusform>%1 : %n occurence trouvé dans %2 de %3 fichiers.</numerusform>
-            <numerusform>%1 : %n occurences trouvés dans %2 de %3 fichiers.</numerusform>
+            <numerusform>%1 : %n occurence trouvé dans %2 de %3 fichiers.</numerusform>
+            <numerusform>%1 : %n occurences trouvés dans %2 de %3 fichiers.</numerusform>
         </translation>
     </message>
 </context>
@@ -2309,37 +2309,37 @@ Voulez vous les écraser?</translation>
     <message>
         <location filename="../../../src/libs/utils/newclasswidget.ui"/>
         <source>Class name:</source>
-        <translation>Nom de la classe :</translation>
+        <translation>Nom de la classe :</translation>
     </message>
     <message>
         <location/>
         <source>Base class:</source>
-        <translation>Classe parent :</translation>
+        <translation>Classe parent :</translation>
     </message>
     <message>
         <location/>
         <source>Header file:</source>
-        <translation>Fichier d&apos;en-tête :</translation>
+        <translation>Fichier d&apos;en-tête :</translation>
     </message>
     <message>
         <location/>
         <source>Source file:</source>
-        <translation>Fichier source :</translation>
+        <translation>Fichier source :</translation>
     </message>
     <message>
         <location/>
         <source>Generate form:</source>
-        <translation>Générer l&apos;interface graphique :</translation>
+        <translation>Générer l&apos;interface graphique :</translation>
     </message>
     <message>
         <location/>
         <source>Form file:</source>
-        <translation>Fichier d&apos;interface :</translation>
+        <translation>Fichier d&apos;interface :</translation>
     </message>
     <message>
         <location/>
         <source>Path:</source>
-        <translation>Chemin :</translation>
+        <translation>Chemin :</translation>
     </message>
     <message>
         <location filename="../../../src/libs/utils/newclasswidget.cpp" line="+392"/>
@@ -2349,17 +2349,17 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+7"/>
         <source>Invalid header file name: &apos;%1&apos;</source>
-        <translation>Nom du fichier d&apos;en-tête invalide : &apos;%1&apos;</translation>
+        <translation>Nom du fichier d&apos;en-tête invalide : &apos;%1&apos;</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Invalid source file name: &apos;%1&apos;</source>
-        <translation>Nom du fichier source invalide : &apos;%1&apos;</translation>
+        <translation>Nom du fichier source invalide : &apos;%1&apos;</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Invalid form file name: &apos;%1&apos;</source>
-        <translation>Nom du fichier d&apos;interface invalide : &apos;%1&apos;</translation>
+        <translation>Nom du fichier d&apos;interface invalide : &apos;%1&apos;</translation>
     </message>
 </context>
 <context>
@@ -2407,7 +2407,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+19"/>
         <source>Path:</source>
-        <translation>Chemin :</translation>
+        <translation>Chemin :</translation>
     </message>
 </context>
 <context>
@@ -2448,12 +2448,12 @@ Voulez vous les écraser?</translation>
     <message>
         <location/>
         <source>Name:</source>
-        <translation>Nom :</translation>
+        <translation>Nom :</translation>
     </message>
     <message>
         <location/>
         <source>Create in:</source>
-        <translation>Créer dans :</translation>
+        <translation>Créer dans :</translation>
     </message>
     <message>
         <location filename="../../../src/libs/utils/projectintropage.cpp" line="+65"/>
@@ -2507,12 +2507,12 @@ Voulez vous les écraser?</translation>
     <message>
         <location/>
         <source>Name:</source>
-        <translation>Nom :</translation>
+        <translation>Nom :</translation>
     </message>
     <message>
         <location/>
         <source>Path:</source>
-        <translation>Chemin :</translation>
+        <translation>Chemin :</translation>
     </message>
 </context>
 <context>
@@ -2670,12 +2670,12 @@ Voulez vous les écraser?</translation>
     <message>
         <location/>
         <source>Header suffix:</source>
-        <translation>Suffixe des headers :</translation>
+        <translation>Suffixe des headers :</translation>
     </message>
     <message>
         <location/>
         <source>Source suffix:</source>
-        <translation>Suffixe des fichiers source :</translation>
+        <translation>Suffixe des fichiers source :</translation>
     </message>
     <message>
         <location/>
@@ -2685,7 +2685,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location/>
         <source>License Template:</source>
-        <translation>Modèle de licence :</translation>
+        <translation>Modèle de licence :</translation>
     </message>
 </context>
 <context>
@@ -2693,7 +2693,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+542"/>
         <source>%1: No such file or directory</source>
-        <translation>%1 : aucun fichier ou répertoire de ce type</translation>
+        <translation>%1 : aucun fichier ou répertoire de ce type</translation>
     </message>
 </context>
 <context>
@@ -2765,7 +2765,7 @@ Voulez vous les écraser?</translation>
         <translation type="unfinished">/**************************************************************************
 ** modèle de licence Qt Creator
 **   Mot-clés spéciaux: %USER% %DATE% %YEAR%
-**   Variables d&apos;environnement : %$VARIABLE%
+**   Variables d&apos;environnement : %$VARIABLE%
 **   Pour échaper un caractère pourcentage, utilisez &apos;%%&apos;.
 **************************************************************************/</translation>
     </message>
@@ -2791,7 +2791,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+1"/>
         <source>Cannot write to %1: %2</source>
-        <translation type="unfinished">Impossible d&apos;écrire %1 : %2</translation>
+        <translation type="unfinished">Impossible d&apos;écrire %1 : %2</translation>
     </message>
 </context>
 <context>
@@ -2803,9 +2803,9 @@ Voulez vous les écraser?</translation>
     </message>
 </context>
 <context>
-    <name>CppTools::Internal::CppQuickOpenFilter</name>
+    <name>CppTools::Internal::CppLocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppquickopenfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/cpptools/cpplocatorfilter.h" line="+53"/>
         <source>Classes and Methods</source>
         <translation>Classes et méthodes</translation>
     </message>
@@ -2967,23 +2967,23 @@ Voulez vous les écraser?</translation>
         <location filename="../../../src/plugins/debugger/breakhandler.cpp" line="+200"/>
         <source>Marker File:</source>
         <translatorcomment>ça sonne un peu bizarre, c&apos;est pas &quot;marked file&quot;...  &quot;Fichier marqueur&quot; ou &quot;marqueur de fichier&quot; ?</translatorcomment>
-        <translation type="unfinished">Fichier marqué :</translation>
+        <translation type="unfinished">Fichier marqué :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Marker Line:</source>
         <translatorcomment>idem</translatorcomment>
-        <translation type="unfinished">Ligne marquée :</translation>
+        <translation type="unfinished">Ligne marquée :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Breakpoint Number:</source>
-        <translation>Numéro du point d&apos;arrêt :</translation>
+        <translation>Numéro du point d&apos;arrêt :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Breakpoint Address:</source>
-        <translation>Adresse du point d&apos;arrêt :</translation>
+        <translation>Adresse du point d&apos;arrêt :</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -3003,32 +3003,32 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+1"/>
         <source>Internal Number:</source>
-        <translation>Numéro interne :</translation>
+        <translation>Numéro interne :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>File Name:</source>
-        <translation>Nom du fichier :</translation>
+        <translation>Nom du fichier :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Function Name:</source>
-        <translation>Nom de la fonction :</translation>
+        <translation>Nom de la fonction :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Line Number:</source>
-        <translation>Numéro de ligne :</translation>
+        <translation>Numéro de ligne :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Condition:</source>
-        <translation>Condition :</translation>
+        <translation>Condition :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ignore Count:</source>
-        <translation type="unfinished">Nombre de passages à ignorer :</translation>
+        <translation type="unfinished">Nombre de passages à ignorer :</translation>
     </message>
     <message>
         <location line="+215"/>
@@ -6150,7 +6150,7 @@ Reason: %3</source>
     <message>
         <location/>
         <source>Targets:</source>
-        <translation type="unfinished">Cibles :</translation>
+        <translation type="unfinished">Cibles :</translation>
     </message>
 </context>
 <context>
@@ -6184,7 +6184,7 @@ Reason: %3</source>
     <message>
         <location line="+450"/>
         <source>Build directory:</source>
-        <translation type="unfinished">Répertoire de compilation :</translation>
+        <translation type="unfinished">Répertoire de compilation :</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -7292,7 +7292,7 @@ Reason: %3</source>
 <context>
     <name>Locator</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenconstants.h" line="+38"/>
+        <location filename="../../../src/plugins/locator/locatorconstants.h" line="+38"/>
         <source>Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8010,7 +8010,7 @@ in your .pro file.</source>
     <message>
         <location/>
         <source>Change:</source>
-        <translation type="unfinished">Modification :</translation>
+        <translation type="unfinished">Modification :</translation>
     </message>
     <message>
         <location/>
@@ -8329,7 +8329,7 @@ in your .pro file.</source>
     <message>
         <location line="+52"/>
         <source>File &amp;pattern:</source>
-        <translation type="unfinished">&amp;Schéma de fichier :</translation>
+        <translation type="unfinished">&amp;Schéma de fichier :</translation>
     </message>
 </context>
 <context>
@@ -8476,7 +8476,7 @@ in your .pro file.</source>
     <message>
         <location line="+47"/>
         <source>File &amp;pattern:</source>
-        <translation type="unfinished">&amp;Schéma de fichier :</translation>
+        <translation type="unfinished">&amp;Schéma de fichier :</translation>
     </message>
 </context>
 <context>
@@ -8499,7 +8499,7 @@ in your .pro file.</source>
     <message>
         <location line="+4"/>
         <source>Working Directory:</source>
-        <translation type="unfinished">Répertoire de travail :</translation>
+        <translation type="unfinished">Répertoire de travail :</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -8539,7 +8539,7 @@ in your .pro file.</source>
     <message>
         <location line="-110"/>
         <source>Base environment for this runconfiguration:</source>
-        <translation type="unfinished">Environnement de base pour cette configuration d&apos;éxecution :</translation>
+        <translation type="unfinished">Environnement de base pour cette configuration d&apos;éxecution :</translation>
     </message>
 </context>
 <context>
@@ -8727,7 +8727,7 @@ in your .pro file.</source>
     <message>
         <location/>
         <source>Working Directory:</source>
-        <translation type="unfinished">Répertoire de travail :</translation>
+        <translation type="unfinished">Répertoire de travail :</translation>
     </message>
     <message>
         <location/>
@@ -9347,7 +9347,7 @@ to version control (%2)?</source>
     <message>
         <location/>
         <source>Additional arguments:</source>
-        <translation type="unfinished">Arguments supplémentaires :</translation>
+        <translation type="unfinished">Arguments supplémentaires :</translation>
     </message>
     <message>
         <location/>
@@ -10135,7 +10135,7 @@ to version control (%2)?</source>
     <message>
         <location line="+7"/>
         <source>Working Directory:</source>
-        <translation type="unfinished">Répertoire de travail :</translation>
+        <translation type="unfinished">Répertoire de travail :</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -10145,7 +10145,7 @@ to version control (%2)?</source>
     <message>
         <location line="+18"/>
         <source>Base environment for this runconfiguration:</source>
-        <translation type="unfinished">Environnement de base pour cette configuration d&apos;éxecution :</translation>
+        <translation type="unfinished">Environnement de base pour cette configuration d&apos;éxecution :</translation>
     </message>
 </context>
 <context>
@@ -10748,9 +10748,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::IQuickOpenFilter</name>
+    <name>Locator::ILocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/iquickopenfilter.cpp" line="+86"/>
+        <location filename="../../../src/plugins/locator/ilocatorfilter.cpp" line="+86"/>
         <source>Filter Configuration</source>
         <translation type="unfinished">Configuration du filtre</translation>
     </message>
@@ -10766,9 +10766,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilter</name>
+    <name>Locator::Internal::DirectoryFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.cpp" line="+44"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.cpp" line="+44"/>
         <source>Generic Directory Filter</source>
         <translation type="unfinished">Filtre de dossier générique</translation>
     </message>
@@ -10803,9 +10803,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilterOptions</name>
+    <name>Locator::Internal::DirectoryFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.ui"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.ui"/>
         <source>Name:</source>
         <translation type="unfinished">Nom:</translation>
     </message>
@@ -10857,17 +10857,17 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilter</name>
+    <name>Locator::Internal::FileSystemFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.h" line="+54"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.h" line="+54"/>
         <source>Files in file system</source>
         <translation type="unfinished">Fichiers du système de fichier</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilterOptions</name>
+    <name>Locator::Internal::FileSystemFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.ui"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.ui"/>
         <source>Filter configuration</source>
         <translation type="unfinished">Configuration du filtre</translation>
     </message>
@@ -10893,33 +10893,33 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::OpenDocumentsFilter</name>
+    <name>Locator::Internal::OpenDocumentsFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/opendocumentsfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/locator/opendocumentsfilter.h" line="+53"/>
         <source>Open documents</source>
         <translation type="unfinished">Ouvrir des documents</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenFiltersFilter</name>
+    <name>Locator::Internal::LocatorFiltersFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenfiltersfilter.cpp" line="+53"/>
+        <location filename="../../../src/plugins/locator/locatorfiltersfilter.cpp" line="+53"/>
         <source>Available filters</source>
         <translation type="unfinished">Filtres disponibles</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenPlugin</name>
+    <name>Locator::Internal::LocatorPlugin</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenplugin.cpp" line="+247"/>
+        <location filename="../../../src/plugins/locator/locatorplugin.cpp" line="+247"/>
         <source>Indexing</source>
         <translation type="unfinished">Indexation</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenToolWindow</name>
+    <name>Locator::Internal::LocatorWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopentoolwindow.cpp" line="+254"/>
+        <location filename="../../../src/plugins/locator/locatorwidget.cpp" line="+254"/>
         <source>Refresh</source>
         <translation type="unfinished">Raffraîchir</translation>
     </message>
@@ -10945,9 +10945,9 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsDialog</name>
+    <name>Locator::Internal::SettingsDialog</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingswidget.ui"/>
+        <location filename="../../../src/plugins/locator/settingswidget.ui"/>
         <source>Configure Filters</source>
         <translation type="unfinished">Configurer les filtres</translation>
     </message>
@@ -10983,17 +10983,17 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsPage</name>
+    <name>Locator::Internal::SettingsPage</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.cpp" line="+159"/>
+        <location filename="../../../src/plugins/locator/settingspage.cpp" line="+159"/>
         <source>%1 (Prefix: %2)</source>
         <translation type="unfinished">%1 (Prefixe: %2)</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsWidget</name>
+    <name>Locator::Internal::SettingsWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.ui"/>
+        <location filename="../../../src/plugins/locator/settingspage.ui"/>
         <source>Configure Filters</source>
         <translation type="unfinished">Configurer les filtres</translation>
     </message>
@@ -11460,12 +11460,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location/>
         <source>Use server start script:</source>
-        <translation type="unfinished">Utiliser le script de démarrage du serveur :</translation>
+        <translation type="unfinished">Utiliser le script de démarrage du serveur :</translation>
     </message>
     <message>
         <location/>
         <source>Server start script:</source>
-        <translation type="unfinished">Script de démarrage du serveur :</translation>
+        <translation type="unfinished">Script de démarrage du serveur :</translation>
     </message>
 </context>
 <context>
@@ -11695,7 +11695,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location line="+8"/>
         <source>Cannot create temporary file: %1</source>
-        <translation type="unfinished">Impossible de créer le fichier temporaire : %1</translation>
+        <translation type="unfinished">Impossible de créer le fichier temporaire : %1</translation>
     </message>
     <message>
         <location line="+186"/>
@@ -11705,7 +11705,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location line="+1"/>
         <source>Revision number:</source>
-        <translation type="unfinished">Numéro de révision :</translation>
+        <translation type="unfinished">Numéro de révision :</translation>
     </message>
     <message>
         <location line="+47"/>
@@ -11723,7 +11723,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
         <source>%1 Executing: %2 %3
 </source>
         <extracomment>&lt;timestamp&gt; Executing: &lt;executable&gt; &lt;arguments&gt;</extracomment>
-        <translation type="obsolete">%1 Exécution de : %2 %3</translation>
+        <translation type="obsolete">%1 Exécution de : %2 %3</translation>
     </message>
     <message>
         <location line="+29"/>
@@ -11799,7 +11799,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
         <location line="+290"/>
         <source>&lt;b&gt;Error:&lt;/b&gt; Could not decode &quot;%1&quot; with &quot;%2&quot;-encoding. Editing not possible.</source>
         <translatorcomment>error -&gt; erreur ;)</translatorcomment>
-        <translation type="unfinished">&lt;b&gt;Erreur :&lt;/b&gt; Impossible de décoder &quot;%1&quot; avec l&apos;encodage &quot;%2&quot;. L&apos;édition est impossible.</translation>
+        <translation type="unfinished">&lt;b&gt;Erreur :&lt;/b&gt; Impossible de décoder &quot;%1&quot; avec l&apos;encodage &quot;%2&quot;. L&apos;édition est impossible.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -11812,12 +11812,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location line="+4283"/>
         <source>Line: %1, Col: %2</source>
-        <translation>Ligne : %1, Col : %2</translation>
+        <translation>Ligne : %1, Col : %2</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Line: %1, Col: 999</source>
-        <translation>Ligne : %1, Col : 999</translation>
+        <translation>Ligne : %1, Col : 999</translation>
     </message>
 </context>
 <context>
@@ -11850,17 +11850,17 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location/>
         <source>Ta&amp;b size:</source>
-        <translation>Taille de &amp;tabulation :</translation>
+        <translation>Taille de &amp;tabulation :</translation>
     </message>
     <message>
         <location/>
         <source>&amp;Indent size:</source>
-        <translation>Taille de l&apos;in&amp;dentation :</translation>
+        <translation>Taille de l&apos;in&amp;dentation :</translation>
     </message>
     <message>
         <location/>
         <source>Tab key performs auto-indent:</source>
-        <translation>La touche tabulation active l&apos;identation automatique :</translation>
+        <translation>La touche tabulation active l&apos;identation automatique :</translation>
     </message>
     <message>
         <location/>
@@ -11973,7 +11973,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location/>
         <source>Display right &amp;margin at column:</source>
-        <translation>Afficher une &amp;marge à la colonne :</translation>
+        <translation>Afficher une &amp;marge à la colonne :</translation>
     </message>
     <message>
         <location/>
@@ -12045,7 +12045,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
     <message>
         <source>
-	This is only an example.</source>
+        This is only an example.</source>
         <translation type="obsolete">\n\tCeci est seulement un exemple.</translation>
     </message>
 </context>
@@ -12060,7 +12060,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
         <location line="+4"/>
         <source>
 The following encodings are likely to fit:</source>
-        <translation type="unfinished">Les encodages suivants pourraient convenir :</translation>
+        <translation type="unfinished">Les encodages suivants pourraient convenir :</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -12096,7 +12096,7 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+37"/>
         <source>&amp;Directory:</source>
-        <translation>&amp;Dossier :</translation>
+        <translation>&amp;Dossier :</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -12107,7 +12107,7 @@ The following encodings are likely to fit:</source>
         <location line="+4"/>
         <source>File &amp;pattern:</source>
         <translatorcomment>Schéma ou motif ? (motif ça fait penser au style du même nom...)</translatorcomment>
-        <translation type="unfinished">&amp;Schéma de fichier :</translation>
+        <translation type="unfinished">&amp;Schéma de fichier :</translation>
     </message>
     <message>
         <location line="+18"/>
@@ -12125,12 +12125,12 @@ The following encodings are likely to fit:</source>
     <message>
         <location/>
         <source>Family:</source>
-        <translation>Famille :</translation>
+        <translation>Famille :</translation>
     </message>
     <message>
         <location/>
         <source>Size:</source>
-        <translation>Taille :</translation>
+        <translation>Taille :</translation>
     </message>
     <message>
         <location/>
@@ -12153,11 +12153,11 @@ The following encodings are likely to fit:</source>
     </message>
     <message>
         <source>Background:</source>
-        <translation type="obsolete">Arrière plan :</translation>
+        <translation type="obsolete">Arrière plan :</translation>
     </message>
     <message>
         <source>Foreground:</source>
-        <translation type="obsolete">Premier plan :</translation>
+        <translation type="obsolete">Premier plan :</translation>
     </message>
     <message>
         <source>Erase background</source>
@@ -12165,7 +12165,7 @@ The following encodings are likely to fit:</source>
     </message>
     <message>
         <source>Preview:</source>
-        <translation type="obsolete">Aperçu :</translation>
+        <translation type="obsolete">Aperçu :</translation>
     </message>
     <message>
         <location/>
@@ -12721,7 +12721,7 @@ The following encodings are likely to fit:</source>
     <message>
         <location filename="../../../src/shared/help/topicchooser.cpp" line="+42"/>
         <source>Choose a topic for &lt;b&gt;%1&lt;/b&gt;:</source>
-        <translation type="unfinished">Choisissez un thème pour &lt;b&gt;%1&lt;/b&gt; :</translation>
+        <translation type="unfinished">Choisissez un thème pour &lt;b&gt;%1&lt;/b&gt; :</translation>
     </message>
 </context>
 <context>
@@ -12764,7 +12764,7 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+15"/>
         <source>Cannot open &apos;%1&apos;: %2</source>
-        <translation>Impossible d&apos;ouvrir &apos;%1&apos; : %2</translation>
+        <translation>Impossible d&apos;ouvrir &apos;%1&apos; : %2</translation>
     </message>
 </context>
 <context>
@@ -12813,17 +12813,17 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+28"/>
         <source>Unable to open &apos;%1&apos;: %2</source>
-        <translation>Impossible d&apos;ouvrir &apos;%1&apos; : %2</translation>
+        <translation>Impossible d&apos;ouvrir &apos;%1&apos; : %2</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>The check script &apos;%1&apos; could not be started: %2</source>
-        <translation>Le script de vérification &apos;%1&apos; ne peut pas être démarré : %2</translation>
+        <translation>Le script de vérification &apos;%1&apos; ne peut pas être démarré : %2</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>The check script &apos;%1&apos; could not be run: %2</source>
-        <translation>Le script de vérification &apos;%1&apos; ne peut pas être exécuté : %2</translation>
+        <translation>Le script de vérification &apos;%1&apos; ne peut pas être exécuté : %2</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -12841,29 +12841,29 @@ The following encodings are likely to fit:</source>
     <message>
         <location/>
         <source>Wrap submit message at:</source>
-        <translation>Limiter la largeur du message à :</translation>
+        <translation>Limiter la largeur du message à :</translation>
     </message>
     <message>
         <location/>
         <source>An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure.</source>
-        <translation type="unfinished">Un fichier exécutable qui est appelé avec comme premier argument le message dans un fichier temporaire. Pour indiquer une erreur, il doit se terminer avec un code != 0 et un message sur la sortie d&apos;erreur standard.</translation>
+        <translation type="unfinished">Un fichier exécutable qui est appelé avec comme premier argument le message dans un fichier temporaire. Pour indiquer une erreur, il doit se terminer avec un code != 0 et un message sur la sortie d&apos;erreur standard.</translation>
     </message>
     <message>
         <location/>
         <source>Submit message check script:</source>
-        <translation>Script de vérification du message :</translation>
+        <translation>Script de vérification du message :</translation>
     </message>
     <message>
         <location/>
         <source>A file listing user names and email addresses in a 4-column mailmap format:
 name &lt;email&gt; alias &lt;email&gt;</source>
-        <translation type="unfinished">Un fichier listant les noms d&apos;utilisateur et leur adresse email dans le format 4 colonnes de mailmap :
+        <translation type="unfinished">Un fichier listant les noms d&apos;utilisateur et leur adresse email dans le format 4 colonnes de mailmap :
 nom &lt;email&gt; alias &lt;/email&gt;</translation>
     </message>
     <message>
         <location/>
         <source>User/alias configuration file:</source>
-        <translation>Fichier de configuration des alias utilisateur :</translation>
+        <translation>Fichier de configuration des alias utilisateur :</translation>
     </message>
     <message>
         <location/>
@@ -12873,7 +12873,7 @@ nom &lt;email&gt; alias &lt;/email&gt;</translation>
     <message>
         <location/>
         <source>User fields configuration file:</source>
-        <translation>Fichier de configuration des champs utilisateurs :</translation>
+        <translation>Fichier de configuration des champs utilisateurs :</translation>
     </message>
 </context>
 <context>
@@ -12888,7 +12888,7 @@ nom &lt;email&gt; alias &lt;/email&gt;</translation>
         <source>Would you like to remove this file from the version control system (%1)?
 Note: This might remove the local file.</source>
         <translation type="unfinished">Voulez-vous retirer ce fichier du système de gestion de versions (%1)?
-Note : Ceci risque de supprimer le fichier du disque.</translation>
+Note : Ceci risque de supprimer le fichier du disque.</translation>
     </message>
 </context>
 <context>
@@ -12920,7 +12920,7 @@ Note : Ceci risque de supprimer le fichier du disque.</translation>
     <message>
         <location/>
         <source>&amp;Username:</source>
-        <translation>&amp;Utilisateur :</translation>
+        <translation>&amp;Utilisateur :</translation>
     </message>
     <message>
         <location/>
@@ -12930,7 +12930,7 @@ Note : Ceci risque de supprimer le fichier du disque.</translation>
     <message>
         <location/>
         <source>&amp;Description:</source>
-        <translation type="unfinished">&amp;Description :</translation>
+        <translation type="unfinished">&amp;Description :</translation>
     </message>
     <message>
         <location/>
@@ -13300,7 +13300,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location/>
         <source>Family:</source>
-        <translation type="unfinished">Famille :</translation>
+        <translation type="unfinished">Famille :</translation>
     </message>
     <message>
         <location/>
@@ -13310,7 +13310,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location/>
         <source>Size:</source>
-        <translation type="unfinished">Taille :</translation>
+        <translation type="unfinished">Taille :</translation>
     </message>
     <message>
         <location/>
@@ -13888,12 +13888,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location/>
         <source>Background:</source>
-        <translation type="unfinished">Arrière plan :</translation>
+        <translation type="unfinished">Arrière plan :</translation>
     </message>
     <message>
         <location/>
         <source>Foreground:</source>
-        <translation type="unfinished">Premier plan :</translation>
+        <translation type="unfinished">Premier plan :</translation>
     </message>
     <message>
         <location/>
@@ -13921,7 +13921,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location/>
         <source>Path:</source>
-        <translation type="unfinished">Chemin :</translation>
+        <translation type="unfinished">Chemin :</translation>
     </message>
 </context>
 <context>
diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts
index eeb8515325223205bcee6529efb98c89613bd297..9448a8bbabf098461a9420459df505f421e510a9 100644
--- a/share/qtcreator/translations/qtcreator_it.ts
+++ b/share/qtcreator/translations/qtcreator_it.ts
@@ -2803,9 +2803,9 @@ Vuoi sovrascriverli?</translation>
     </message>
 </context>
 <context>
-    <name>CppTools::Internal::CppQuickOpenFilter</name>
+    <name>CppTools::Internal::CppLocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppquickopenfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/cpptools/cpplocatorfilter.h" line="+53"/>
         <source>Classes and Methods</source>
         <translation>Classi e Metodi</translation>
     </message>
@@ -7760,7 +7760,7 @@ Causa: %3</translation>
 <context>
     <name>Locator</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenconstants.h" line="+38"/>
+        <location filename="../../../src/plugins/locator/locatorconstants.h" line="+38"/>
         <source>Filters</source>
         <translation>Filtri</translation>
     </message>
@@ -11551,9 +11551,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::IQuickOpenFilter</name>
+    <name>Locator::ILocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/iquickopenfilter.cpp" line="+86"/>
+        <location filename="../../../src/plugins/locator/ilocatorfilter.cpp" line="+86"/>
         <source>Filter Configuration</source>
         <translation>Configurazione del Filtro</translation>
     </message>
@@ -11569,9 +11569,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilter</name>
+    <name>Locator::Internal::DirectoryFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.cpp" line="+44"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.cpp" line="+44"/>
         <source>Generic Directory Filter</source>
         <translation>Filtro Cartella Generica</translation>
     </message>
@@ -11606,9 +11606,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilterOptions</name>
+    <name>Locator::Internal::DirectoryFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.ui"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.ui"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
@@ -11661,17 +11661,17 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilter</name>
+    <name>Locator::Internal::FileSystemFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.h" line="+54"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.h" line="+54"/>
         <source>Files in file system</source>
         <translation>File nel file system</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilterOptions</name>
+    <name>Locator::Internal::FileSystemFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.ui"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.ui"/>
         <source>Filter configuration</source>
         <translation>Configurazione del filtro</translation>
     </message>
@@ -11697,33 +11697,33 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::OpenDocumentsFilter</name>
+    <name>Locator::Internal::OpenDocumentsFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/opendocumentsfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/locator/opendocumentsfilter.h" line="+53"/>
         <source>Open documents</source>
         <translation>Documenti aperti</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenFiltersFilter</name>
+    <name>Locator::Internal::LocatorFiltersFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenfiltersfilter.cpp" line="+53"/>
+        <location filename="../../../src/plugins/locator/locatorfiltersfilter.cpp" line="+53"/>
         <source>Available filters</source>
         <translation>Filtri disponibili</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenPlugin</name>
+    <name>Locator::Internal::LocatorPlugin</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenplugin.cpp" line="+247"/>
+        <location filename="../../../src/plugins/locator/locatorplugin.cpp" line="+247"/>
         <source>Indexing</source>
         <translation>Indicizzazione</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenToolWindow</name>
+    <name>Locator::Internal::LocatorWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopentoolwindow.cpp" line="+254"/>
+        <location filename="../../../src/plugins/locator/locatorwidget.cpp" line="+254"/>
         <source>Refresh</source>
         <translation>Aggiorna</translation>
     </message>
@@ -11749,9 +11749,9 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsDialog</name>
+    <name>Locator::Internal::SettingsDialog</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingswidget.ui"/>
+        <location filename="../../../src/plugins/locator/settingswidget.ui"/>
         <source>Configure Filters</source>
         <translation>Configura i Filtri</translation>
     </message>
@@ -11787,17 +11787,17 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsPage</name>
+    <name>Locator::Internal::SettingsPage</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.cpp" line="+159"/>
+        <location filename="../../../src/plugins/locator/settingspage.cpp" line="+159"/>
         <source>%1 (Prefix: %2)</source>
         <translation>%1 (Prefisso: %2)</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsWidget</name>
+    <name>Locator::Internal::SettingsWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.ui"/>
+        <location filename="../../../src/plugins/locator/settingspage.ui"/>
         <source>Configure Filters</source>
         <translation>Configura i Filtri</translation>
     </message>
@@ -12850,9 +12850,9 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da
     </message>
     <message>
         <source>
-	This is only an example.</source>
+        This is only an example.</source>
         <translation type="obsolete">
-	Questo è solo un esempio.</translation>
+        Questo è solo un esempio.</translation>
     </message>
 </context>
 <context>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 1da4219aac800b23690737330998b1b8427bb460..504eecda75487ef1d847ca8193ca5d10dcc5afa6 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -2811,9 +2811,9 @@ Would you like to overwrite them?</source>
     </message>
 </context>
 <context>
-    <name>CppTools::Internal::CppQuickOpenFilter</name>
+    <name>CppTools::Internal::CppLocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppquickopenfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/cpptools/cpplocatorfilter.h" line="+53"/>
         <source>Classes and Methods</source>
         <translation>クラスとメソッド</translation>
     </message>
@@ -7764,7 +7764,7 @@ Reason: %3</source>
 <context>
     <name>Locator</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenconstants.h" line="+38"/>
+        <location filename="../../../src/plugins/locator/locatorconstants.h" line="+38"/>
         <source>Filters</source>
         <translation>フィルタ</translation>
     </message>
@@ -11555,9 +11555,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::IQuickOpenFilter</name>
+    <name>Locator::ILocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/iquickopenfilter.cpp" line="+86"/>
+        <location filename="../../../src/plugins/locator/ilocatorfilter.cpp" line="+86"/>
         <source>Filter Configuration</source>
         <translation>フィルタ設定</translation>
     </message>
@@ -11573,9 +11573,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilter</name>
+    <name>Locator::Internal::DirectoryFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.cpp" line="+44"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.cpp" line="+44"/>
         <source>Generic Directory Filter</source>
         <translation>通常のディレクトリ フィルタ</translation>
     </message>
@@ -11609,9 +11609,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilterOptions</name>
+    <name>Locator::Internal::DirectoryFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.ui"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.ui"/>
         <source>Name:</source>
         <translation>名前:</translation>
     </message>
@@ -11664,17 +11664,17 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilter</name>
+    <name>Locator::Internal::FileSystemFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.h" line="+54"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.h" line="+54"/>
         <source>Files in file system</source>
         <translation>ファイル システム上のファイル</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilterOptions</name>
+    <name>Locator::Internal::FileSystemFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.ui"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.ui"/>
         <source>Filter configuration</source>
         <translation>フィルタ設定</translation>
     </message>
@@ -11700,33 +11700,33 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::OpenDocumentsFilter</name>
+    <name>Locator::Internal::OpenDocumentsFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/opendocumentsfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/locator/opendocumentsfilter.h" line="+53"/>
         <source>Open documents</source>
         <translation>ドキュメントを開く</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenFiltersFilter</name>
+    <name>Locator::Internal::LocatorFiltersFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenfiltersfilter.cpp" line="+53"/>
+        <location filename="../../../src/plugins/locator/locatorfiltersfilter.cpp" line="+53"/>
         <source>Available filters</source>
         <translation>使用可能なフィルタ</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenPlugin</name>
+    <name>Locator::Internal::LocatorPlugin</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenplugin.cpp" line="+247"/>
+        <location filename="../../../src/plugins/locator/locatorplugin.cpp" line="+247"/>
         <source>Indexing</source>
         <translation>解析中</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenToolWindow</name>
+    <name>Locator::Internal::LocatorWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopentoolwindow.cpp" line="+254"/>
+        <location filename="../../../src/plugins/locator/locatorwidget.cpp" line="+254"/>
         <source>Refresh</source>
         <translation>æ›´æ–°</translation>
     </message>
@@ -11752,9 +11752,9 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsDialog</name>
+    <name>Locator::Internal::SettingsDialog</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingswidget.ui"/>
+        <location filename="../../../src/plugins/locator/settingswidget.ui"/>
         <source>Configure Filters</source>
         <translation>フィルタ設定</translation>
     </message>
@@ -11790,17 +11790,17 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsPage</name>
+    <name>Locator::Internal::SettingsPage</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.cpp" line="+159"/>
+        <location filename="../../../src/plugins/locator/settingspage.cpp" line="+159"/>
         <source>%1 (Prefix: %2)</source>
         <translation>%1 (プレフィクス: %2)</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsWidget</name>
+    <name>Locator::Internal::SettingsWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.ui"/>
+        <location filename="../../../src/plugins/locator/settingspage.ui"/>
         <source>Configure Filters</source>
         <translation>フィルタ設定</translation>
     </message>
@@ -12853,9 +12853,9 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
     <message>
         <source>
-	This is only an example.</source>
+        This is only an example.</source>
         <translation type="obsolete">
-	This is only an example.</translation>
+        This is only an example.</translation>
     </message>
 </context>
 <context>
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index 2f2b7e8035af0a9634a009fac7ff0ff2f1959ee3..1f45682dd441f11a7ef9a4619394be01189856bd 100644
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts
@@ -2769,9 +2769,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilterOptions</name>
+    <name>Locator::Internal::DirectoryFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.ui"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.ui"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2823,9 +2823,9 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilterOptions</name>
+    <name>Locator::Internal::FileSystemFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.ui"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.ui"/>
         <source>Filter configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2851,9 +2851,9 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsWidget</name>
+    <name>Locator::Internal::SettingsWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.ui"/>
+        <location filename="../../../src/plugins/locator/settingspage.ui"/>
         <source>Configure Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2884,9 +2884,9 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsDialog</name>
+    <name>Locator::Internal::SettingsDialog</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingswidget.ui"/>
+        <location filename="../../../src/plugins/locator/settingswidget.ui"/>
         <source>Configure Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5901,9 +5901,9 @@ Note: This might remove the local file.</source>
     </message>
 </context>
 <context>
-    <name>CppTools::Internal::CppQuickOpenFilter</name>
+    <name>CppTools::Internal::CppLocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppquickopenfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/cpptools/cpplocatorfilter.h" line="+53"/>
         <source>Classes and Methods</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13421,9 +13421,9 @@ Check if the phone is connected and the TRK application is running.</source>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilter</name>
+    <name>Locator::Internal::DirectoryFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.cpp" line="+44"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.cpp" line="+44"/>
         <source>Generic Directory Filter</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13457,17 +13457,17 @@ Check if the phone is connected and the TRK application is running.</source>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilter</name>
+    <name>Locator::Internal::FileSystemFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.h" line="+54"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.h" line="+54"/>
         <source>Files in file system</source>
         <translation>Pliki w systemie plików</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::IQuickOpenFilter</name>
+    <name>Locator::ILocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/iquickopenfilter.cpp" line="+86"/>
+        <location filename="../../../src/plugins/locator/ilocatorfilter.cpp" line="+86"/>
         <source>Filter Configuration</source>
         <translation>Konfiguracja filtra</translation>
     </message>
@@ -13483,9 +13483,9 @@ Check if the phone is connected and the TRK application is running.</source>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::OpenDocumentsFilter</name>
+    <name>Locator::Internal::OpenDocumentsFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/opendocumentsfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/locator/opendocumentsfilter.h" line="+53"/>
         <source>Open documents</source>
         <translation>Otwarte dokumenty</translation>
     </message>
@@ -13493,7 +13493,7 @@ Check if the phone is connected and the TRK application is running.</source>
 <context>
     <name>Locator</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenconstants.h" line="+38"/>
+        <location filename="../../../src/plugins/locator/locatorconstants.h" line="+38"/>
         <source>Filters</source>
         <translation>Filtry</translation>
     </message>
@@ -13504,25 +13504,25 @@ Check if the phone is connected and the TRK application is running.</source>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenFiltersFilter</name>
+    <name>Locator::Internal::LocatorFiltersFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenfiltersfilter.cpp" line="+53"/>
+        <location filename="../../../src/plugins/locator/locatorfiltersfilter.cpp" line="+53"/>
         <source>Available filters</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenPlugin</name>
+    <name>Locator::Internal::LocatorPlugin</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenplugin.cpp" line="+247"/>
+        <location filename="../../../src/plugins/locator/locatorplugin.cpp" line="+247"/>
         <source>Indexing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenToolWindow</name>
+    <name>Locator::Internal::LocatorWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopentoolwindow.cpp" line="+254"/>
+        <location filename="../../../src/plugins/locator/locatorwidget.cpp" line="+254"/>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13548,9 +13548,9 @@ Check if the phone is connected and the TRK application is running.</source>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsPage</name>
+    <name>Locator::Internal::SettingsPage</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.cpp" line="+159"/>
+        <location filename="../../../src/plugins/locator/settingspage.cpp" line="+159"/>
         <source>%1 (Prefix: %2)</source>
         <translation>%1 (Przedrostek: %2)</translation>
     </message>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index fcd83e541aad4b01855fe1dea32fb38eecb7b679..f142b4edb8926b3c9fe107789ce662283b44c6e4 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -2973,9 +2973,9 @@ Would you like to overwrite them?</source>
     </message>
 </context>
 <context>
-    <name>CppTools::Internal::CppQuickOpenFilter</name>
+    <name>CppTools::Internal::CppLocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppquickopenfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/cpptools/cpplocatorfilter.h" line="+53"/>
         <source>Classes and Methods</source>
         <translation>Классы и методы</translation>
     </message>
@@ -8207,7 +8207,7 @@ Perl через переменные среды окружения.</translation
 <context>
     <name>Locator</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenconstants.h" line="+38"/>
+        <location filename="../../../src/plugins/locator/locatorconstants.h" line="+38"/>
         <source>Filters</source>
         <translation>Фильтры</translation>
     </message>
@@ -13249,9 +13249,9 @@ Check if the phone is connected and the TRK application is running.</source>
     </message>
 </context>
 <context>
-    <name>QuickOpen::IQuickOpenFilter</name>
+    <name>Locator::ILocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/iquickopenfilter.cpp" line="+86"/>
+        <location filename="../../../src/plugins/locator/ilocatorfilter.cpp" line="+86"/>
         <source>Filter Configuration</source>
         <translation type="unfinished">Настройка фильтра</translation>
     </message>
@@ -13267,9 +13267,9 @@ Check if the phone is connected and the TRK application is running.</source>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilter</name>
+    <name>Locator::Internal::DirectoryFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.cpp" line="+44"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.cpp" line="+44"/>
         <source>Generic Directory Filter</source>
         <translation>Базовый фильтр каталогов</translation>
     </message>
@@ -13305,9 +13305,9 @@ Check if the phone is connected and the TRK application is running.</source>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilterOptions</name>
+    <name>Locator::Internal::DirectoryFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.ui"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.ui"/>
         <source>Name:</source>
         <translation>Название:</translation>
     </message>
@@ -13360,17 +13360,17 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilter</name>
+    <name>Locator::Internal::FileSystemFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.h" line="+54"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.h" line="+54"/>
         <source>Files in file system</source>
         <translation>Файлы в системе</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilterOptions</name>
+    <name>Locator::Internal::FileSystemFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.ui"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.ui"/>
         <source>Filter configuration</source>
         <translation>Настройка фильтра</translation>
     </message>
@@ -13396,33 +13396,33 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::OpenDocumentsFilter</name>
+    <name>Locator::Internal::OpenDocumentsFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/opendocumentsfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/locator/opendocumentsfilter.h" line="+53"/>
         <source>Open documents</source>
         <translation>Открытые документы</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenFiltersFilter</name>
+    <name>Locator::Internal::LocatorFiltersFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenfiltersfilter.cpp" line="+53"/>
+        <location filename="../../../src/plugins/locator/locatorfiltersfilter.cpp" line="+53"/>
         <source>Available filters</source>
         <translation type="unfinished">Доступные фильтры</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenPlugin</name>
+    <name>Locator::Internal::LocatorPlugin</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenplugin.cpp" line="+247"/>
+        <location filename="../../../src/plugins/locator/locatorplugin.cpp" line="+247"/>
         <source>Indexing</source>
         <translation>Индексация</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenToolWindow</name>
+    <name>Locator::Internal::LocatorWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopentoolwindow.cpp" line="+254"/>
+        <location filename="../../../src/plugins/locator/locatorwidget.cpp" line="+254"/>
         <source>Refresh</source>
         <translation>Обновить</translation>
     </message>
@@ -13448,9 +13448,9 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsDialog</name>
+    <name>Locator::Internal::SettingsDialog</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingswidget.ui"/>
+        <location filename="../../../src/plugins/locator/settingswidget.ui"/>
         <source>Configure Filters</source>
         <translation>Настройка фильтров</translation>
     </message>
@@ -13486,17 +13486,17 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsPage</name>
+    <name>Locator::Internal::SettingsPage</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.cpp" line="+159"/>
+        <location filename="../../../src/plugins/locator/settingspage.cpp" line="+159"/>
         <source>%1 (Prefix: %2)</source>
         <translation>%1 (префикс: %2)</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsWidget</name>
+    <name>Locator::Internal::SettingsWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.ui"/>
+        <location filename="../../../src/plugins/locator/settingspage.ui"/>
         <source>Configure Filters</source>
         <translation>Настройка фильтров</translation>
     </message>
@@ -13681,7 +13681,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location/>
         <source>Automatically save all files before building</source>
-        <translation>Автоматически сохранять все 
+        <translation>Автоматически сохранять все
 файлы перед сборкой</translation>
     </message>
 </context>
diff --git a/src/plugins/cpptools/CppTools.pluginspec b/src/plugins/cpptools/CppTools.pluginspec
index 2ea5671746aecd2a2e0dd3cecc0b2b1139a1f085..0d80ce36cfc420dc5bf49bd3b4e2909198942a50 100644
--- a/src/plugins/cpptools/CppTools.pluginspec
+++ b/src/plugins/cpptools/CppTools.pluginspec
@@ -21,6 +21,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <dependencyList>
         <dependency name="TextEditor" version="1.2.93"/>
         <dependency name="ProjectExplorer" version="1.2.93"/>
-        <dependency name="QuickOpen" version="1.2.93"/>
+        <dependency name="Locator" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/cpptools/cppclassesfilter.cpp b/src/plugins/cpptools/cppclassesfilter.cpp
index d1725c67b7890fdb2f0a4a5ebb3ac249a970917b..db6310cf211b589e5fba9647c79c1bdffaa2c562 100644
--- a/src/plugins/cpptools/cppclassesfilter.cpp
+++ b/src/plugins/cpptools/cppclassesfilter.cpp
@@ -32,7 +32,7 @@
 using namespace CppTools::Internal;
 
 CppClassesFilter::CppClassesFilter(CppModelManager *manager, Core::EditorManager *editorManager)
-    : CppQuickOpenFilter(manager, editorManager)
+    : CppLocatorFilter(manager, editorManager)
 {
     setShortcutString("c");
     setIncludedByDefault(false);
diff --git a/src/plugins/cpptools/cppclassesfilter.h b/src/plugins/cpptools/cppclassesfilter.h
index 267f4ed0e5fa0e7f4cd736827226310e9f3fff9c..6069eb70a5dcf7e0337f8231e0d4180e00a3d538 100644
--- a/src/plugins/cpptools/cppclassesfilter.h
+++ b/src/plugins/cpptools/cppclassesfilter.h
@@ -30,12 +30,12 @@
 #ifndef CPPCLASSESFILTER_H
 #define CPPCLASSESFILTER_H
 
-#include <cppquickopenfilter.h>
+#include <cpplocatorfilter.h>
 
 namespace CppTools {
 namespace Internal {
 
-class CppClassesFilter : public CppQuickOpenFilter
+class CppClassesFilter : public CppLocatorFilter
 {
     Q_OBJECT
 
diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
index d13839cc967d34b19b5cfaca1487841a28da9798..eb6845d965607acdf97e9978c1aaf9006023405d 100644
--- a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
+++ b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
@@ -58,11 +58,11 @@ CppCurrentDocumentFilter::CppCurrentDocumentFilter(CppModelManager *manager, Cor
             this,          SLOT(onEditorAboutToClose(Core::IEditor*)));
 }
 
-QList<QuickOpen::FilterEntry> CppCurrentDocumentFilter::matchesFor(const QString & origEntry)
+QList<Locator::FilterEntry> CppCurrentDocumentFilter::matchesFor(const QString & origEntry)
 {
     QString entry = trimWildcards(origEntry);
-    QList<QuickOpen::FilterEntry> goodEntries;
-    QList<QuickOpen::FilterEntry> betterEntries;
+    QList<Locator::FilterEntry> goodEntries;
+    QList<Locator::FilterEntry> betterEntries;
     QStringMatcher matcher(entry, Qt::CaseInsensitive);
     const QRegExp regexp("*"+entry+"*", Qt::CaseInsensitive, QRegExp::Wildcard);
     if (!regexp.isValid())
@@ -86,7 +86,7 @@ QList<QuickOpen::FilterEntry> CppCurrentDocumentFilter::matchesFor(const QString
         {
             QString symbolName = info.symbolName;// + (info.type == ModelItemInfo::Declaration ? ";" : " {...}");
             QVariant id = qVariantFromValue(info);
-            QuickOpen::FilterEntry filterEntry(this, symbolName, id, info.icon);
+            Locator::FilterEntry filterEntry(this, symbolName, id, info.icon);
             filterEntry.extraInfo = info.symbolType;
 
             if (info.symbolName.startsWith(entry))
@@ -102,7 +102,7 @@ QList<QuickOpen::FilterEntry> CppCurrentDocumentFilter::matchesFor(const QString
     return betterEntries;
 }
 
-void CppCurrentDocumentFilter::accept(QuickOpen::FilterEntry selection) const
+void CppCurrentDocumentFilter::accept(Locator::FilterEntry selection) const
 {
     ModelItemInfo info = qvariant_cast<CppTools::Internal::ModelItemInfo>(selection.internalData);
     TextEditor::BaseTextEditor::openEditorAt(info.fileName, info.line);
diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.h b/src/plugins/cpptools/cppcurrentdocumentfilter.h
index 58cfcff7cd0914d872a733eae0fa8f69f8a637d3..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/iquickopenfilter.h>
+#include <locator/ilocatorfilter.h>
 
 namespace Core {
 class EditorManager;
@@ -42,7 +42,7 @@ namespace Internal {
 
 class CppModelManager;
 
-class CppCurrentDocumentFilter : public  QuickOpen::IQuickOpenFilter
+class CppCurrentDocumentFilter : public  Locator::ILocatorFilter
 {
     Q_OBJECT
 
@@ -53,8 +53,8 @@ public:
     QString trName() const { return tr("Methods in current Document"); }
     QString name() const { return QLatin1String("Methods in current Document"); }
     Priority priority() const { return Medium; }
-    QList<QuickOpen::FilterEntry> matchesFor(const QString &entry);
-    void accept(QuickOpen::FilterEntry selection) const;
+    QList<Locator::FilterEntry> matchesFor(const QString &entry);
+    void accept(Locator::FilterEntry selection) const;
     void refresh(QFutureInterface<void> &future);
 
 private slots:
diff --git a/src/plugins/cpptools/cppfunctionsfilter.cpp b/src/plugins/cpptools/cppfunctionsfilter.cpp
index 257d06ec5bb08dee90372c228d9b5c5c7277ef1a..01b4e823da657cddb37b643b82c4321362db3d61 100644
--- a/src/plugins/cpptools/cppfunctionsfilter.cpp
+++ b/src/plugins/cpptools/cppfunctionsfilter.cpp
@@ -32,7 +32,7 @@
 using namespace CppTools::Internal;
 
 CppFunctionsFilter::CppFunctionsFilter(CppModelManager *manager, Core::EditorManager *editorManager)
-    : CppQuickOpenFilter(manager, editorManager)
+    : CppLocatorFilter(manager, editorManager)
 {
     setShortcutString("m");
     setIncludedByDefault(false);
diff --git a/src/plugins/cpptools/cppfunctionsfilter.h b/src/plugins/cpptools/cppfunctionsfilter.h
index 7f986587332aec0d433799487ac39ada98ce6242..d28c4cc4727642cf465e9aa4278f8e449112def8 100644
--- a/src/plugins/cpptools/cppfunctionsfilter.h
+++ b/src/plugins/cpptools/cppfunctionsfilter.h
@@ -30,12 +30,12 @@
 #ifndef CPPFUNCTIONSFILTER_H
 #define CPPFUNCTIONSFILTER_H
 
-#include <cppquickopenfilter.h>
+#include <cpplocatorfilter.h>
 
 namespace CppTools {
 namespace Internal {
 
-class CppFunctionsFilter : public CppQuickOpenFilter
+class CppFunctionsFilter : public CppLocatorFilter
 {
     Q_OBJECT
 
diff --git a/src/plugins/cpptools/cppquickopenfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp
similarity index 81%
rename from src/plugins/cpptools/cppquickopenfilter.cpp
rename to src/plugins/cpptools/cpplocatorfilter.cpp
index 1e8199a900f5fa9b56c5114e3fa8eba23e0080a3..df38a42a8d6b21c870d06db67ab4717fca48d917 100644
--- a/src/plugins/cpptools/cppquickopenfilter.cpp
+++ b/src/plugins/cpptools/cpplocatorfilter.cpp
@@ -27,7 +27,7 @@
 **
 **************************************************************************/
 
-#include "cppquickopenfilter.h"
+#include "cpplocatorfilter.h"
 #include "cppmodelmanager.h"
 
 #include <coreplugin/editormanager/editormanager.h>
@@ -39,7 +39,7 @@
 
 using namespace CppTools::Internal;
 
-CppQuickOpenFilter::CppQuickOpenFilter(CppModelManager *manager, Core::EditorManager *editorManager)
+CppLocatorFilter::CppLocatorFilter(CppModelManager *manager, Core::EditorManager *editorManager)
     : m_manager(manager),
     m_editorManager(editorManager),
     m_forceNewSearchList(true)
@@ -54,36 +54,36 @@ CppQuickOpenFilter::CppQuickOpenFilter(CppModelManager *manager, Core::EditorMan
             this, SLOT(onAboutToRemoveFiles(QStringList)));
 }
 
-CppQuickOpenFilter::~CppQuickOpenFilter()
+CppLocatorFilter::~CppLocatorFilter()
 { }
 
-void CppQuickOpenFilter::onDocumentUpdated(CPlusPlus::Document::Ptr doc)
+void CppLocatorFilter::onDocumentUpdated(CPlusPlus::Document::Ptr doc)
 {
     m_searchList[doc->fileName()] = Info(doc);
 }
 
-void CppQuickOpenFilter::onAboutToRemoveFiles(const QStringList &files)
+void CppLocatorFilter::onAboutToRemoveFiles(const QStringList &files)
 {
     foreach (const QString &file, files)
         m_searchList.remove(file);
 }
 
-void CppQuickOpenFilter::refresh(QFutureInterface<void> &future)
+void CppLocatorFilter::refresh(QFutureInterface<void> &future)
 {
     Q_UNUSED(future)
 }
 
-static bool compareLexigraphically(const QuickOpen::FilterEntry &a,
-                                   const QuickOpen::FilterEntry &b)
+static bool compareLexigraphically(const Locator::FilterEntry &a,
+                                   const Locator::FilterEntry &b)
 {
     return a.displayName < b.displayName;
 }
 
-QList<QuickOpen::FilterEntry> CppQuickOpenFilter::matchesFor(const QString &origEntry)
+QList<Locator::FilterEntry> CppLocatorFilter::matchesFor(const QString &origEntry)
 {
     QString entry = trimWildcards(origEntry);
-    QList<QuickOpen::FilterEntry> goodEntries;
-    QList<QuickOpen::FilterEntry> betterEntries;
+    QList<Locator::FilterEntry> goodEntries;
+    QList<Locator::FilterEntry> betterEntries;
     QStringMatcher matcher(entry, Qt::CaseInsensitive);
     const QRegExp regexp("*"+entry+"*", Qt::CaseInsensitive, QRegExp::Wildcard);
     if (!regexp.isValid())
@@ -108,7 +108,7 @@ QList<QuickOpen::FilterEntry> CppQuickOpenFilter::matchesFor(const QString &orig
                     || (!hasWildcard && matcher.indexIn(info.symbolName) != -1)) {
 
                 QVariant id = qVariantFromValue(info);
-                QuickOpen::FilterEntry filterEntry(this, info.symbolName, id, info.icon);
+                Locator::FilterEntry filterEntry(this, info.symbolName, id, info.icon);
                 if (! info.symbolType.isEmpty())
                     filterEntry.extraInfo = info.symbolType;
                 else
@@ -131,7 +131,7 @@ QList<QuickOpen::FilterEntry> CppQuickOpenFilter::matchesFor(const QString &orig
     return betterEntries;
 }
 
-void CppQuickOpenFilter::accept(QuickOpen::FilterEntry selection) const
+void CppLocatorFilter::accept(Locator::FilterEntry selection) const
 {
     ModelItemInfo info = qvariant_cast<CppTools::Internal::ModelItemInfo>(selection.internalData);
     TextEditor::BaseTextEditor::openEditorAt(info.fileName, info.line);
diff --git a/src/plugins/cpptools/cppquickopenfilter.h b/src/plugins/cpptools/cpplocatorfilter.h
similarity index 84%
rename from src/plugins/cpptools/cppquickopenfilter.h
rename to src/plugins/cpptools/cpplocatorfilter.h
index 7e70b4dc811a1901899cfdebe45f238c36b072ee..c33fcf45ae4193f0be841573145aa13e934bb872 100644
--- a/src/plugins/cpptools/cppquickopenfilter.h
+++ b/src/plugins/cpptools/cpplocatorfilter.h
@@ -27,12 +27,12 @@
 **
 **************************************************************************/
 
-#ifndef CPPQUICKOPENFILTER_H
-#define CPPQUICKOPENFILTER_H
+#ifndef CPPLOCATORFILTER_H
+#define CPPLOCATORFILTER_H
 
 #include "searchsymbols.h"
 
-#include <quickopen/iquickopenfilter.h>
+#include <locator/ilocatorfilter.h>
 
 namespace Core {
 class EditorManager;
@@ -43,18 +43,18 @@ namespace Internal {
 
 class CppModelManager;
 
-class CppQuickOpenFilter : public QuickOpen::IQuickOpenFilter
+class CppLocatorFilter : public Locator::ILocatorFilter
 {
     Q_OBJECT
 public:
-    CppQuickOpenFilter(CppModelManager *manager, Core::EditorManager *editorManager);
-    ~CppQuickOpenFilter();
+    CppLocatorFilter(CppModelManager *manager, Core::EditorManager *editorManager);
+    ~CppLocatorFilter();
 
     QString trName() const { return tr("Classes and Methods"); }
     QString name() const { return QLatin1String("Classes and Methods"); }
     Priority priority() const { return Medium; }
-    QList<QuickOpen::FilterEntry> matchesFor(const QString &entry);
-    void accept(QuickOpen::FilterEntry selection) const;
+    QList<Locator::FilterEntry> matchesFor(const QString &entry);
+    void accept(Locator::FilterEntry selection) const;
     void refresh(QFutureInterface<void> &future);
 
 protected:
@@ -86,4 +86,4 @@ private:
 } // namespace Internal
 } // namespace CppTools
 
-#endif // CPPQUICKOPENFILTER_H
+#endif // CPPLOCATORFILTER_H
diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro
index 8751f0f88d286972b4949410121288c7a7e01aca..de7adcd66f672bc640f4525dc42d2622927f9ccd 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/locator.pri)
 include(cpptools_dependencies.pri)
 
 # DEFINES += QT_NO_CAST_FROM_ASCII
@@ -15,7 +15,7 @@ HEADERS += completionsettingspage.h \
     cppfunctionsfilter.h \
     cppmodelmanager.h \
     cppmodelmanagerinterface.h \
-    cppquickopenfilter.h \
+    cpplocatorfilter.h \
     cpptools_global.h \
     cpptoolsconstants.h \
     cpptoolseditorsupport.h \
@@ -31,7 +31,7 @@ SOURCES += completionsettingspage.cpp \
     cppcurrentdocumentfilter.cpp \
     cppfunctionsfilter.cpp \
     cppmodelmanager.cpp \
-    cppquickopenfilter.cpp \
+    cpplocatorfilter.cpp \
     cpptoolseditorsupport.cpp \
     cpptoolsplugin.cpp \
     searchsymbols.cpp \
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp
index 3b24b91f163b4a6f1dcb6d9e82e3c06cdde14320..bbc894390c8a225c9a2b99c3d2587e97383f2351 100644
--- a/src/plugins/cpptools/cpptoolsplugin.cpp
+++ b/src/plugins/cpptools/cpptoolsplugin.cpp
@@ -36,7 +36,7 @@
 #include "cppcurrentdocumentfilter.h"
 #include "cppmodelmanager.h"
 #include "cpptoolsconstants.h"
-#include "cppquickopenfilter.h"
+#include "cpplocatorfilter.h"
 
 #include <extensionsystem/pluginmanager.h>
 
@@ -104,9 +104,9 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error)
 
     addAutoReleasedObject(new CppQuickFixCollector(m_modelManager));
 
-    CppQuickOpenFilter *quickOpenFilter = new CppQuickOpenFilter(m_modelManager,
+    CppLocatorFilter *locatorFilter = new CppLocatorFilter(m_modelManager,
                                                                  core->editorManager());
-    addAutoReleasedObject(quickOpenFilter);
+    addAutoReleasedObject(locatorFilter);
     addAutoReleasedObject(new CppClassesFilter(m_modelManager, core->editorManager()));
     addAutoReleasedObject(new CppFunctionsFilter(m_modelManager, core->editorManager()));
     addAutoReleasedObject(new CppCurrentDocumentFilter(m_modelManager, core->editorManager()));
diff --git a/src/plugins/designer/settingspage.h b/src/plugins/designer/settingspage.h
index 7dfbd97a3278b012ab089303f5884165d3a10ab4..ee5152c2b78e0ea7b006d23a88aaedb4cff005d6 100644
--- a/src/plugins/designer/settingspage.h
+++ b/src/plugins/designer/settingspage.h
@@ -63,6 +63,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace QuickOpen
+} // namespace Designer
 
 #endif // DESIGNER_SETTINGSPAGE_H
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index 33a6ac1be9d1dc53e53eac045e9f38b221c1e92b..abec06d97eaf6f56f18e57936c84843a3067a291 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -52,7 +52,7 @@
 //   There is always a "current" cursor (m_tc). A current "region of interest"
 //   spans between m_anchor (== anchor()) and  m_tc.position() (== position())
 //   The value of m_tc.anchor() is not used.
-// 
+//
 
 #include <utils/qtcassert.h>
 
@@ -213,7 +213,7 @@ struct Range
 
     Range(int b, int e, RangeMode m = RangeCharMode)
         : beginPos(qMin(b, e)), endPos(qMax(b, e)), rangemode(m)
-    {} 
+    {}
 
     int beginPos;
     int endPos;
@@ -518,7 +518,7 @@ bool FakeVimHandler::Private::wantsOverride(QKeyEvent *ev)
 
     // We are interested in overriding  most Ctrl key combinations
     if (mods == Qt::ControlModifier && key >= Key_A && key <= Key_Z && key != Key_K) {
-        // Ctrl-K is special as it is the Core's default notion of QuickOpen
+        // Ctrl-K is special as it is the Core's default notion of Locator
         if (m_passing) {
             KEY_DEBUG(" PASSING CTRL KEY");
             // We get called twice on the same key
@@ -566,7 +566,7 @@ EventResult FakeVimHandler::Private::handleEvent(QKeyEvent *ev)
         setTargetColumn();
 
     m_tc.setVisualNavigation(true);
-    
+
     if (m_fakeEnd)
         moveRight();
 
@@ -913,9 +913,9 @@ void FakeVimHandler::Private::updateMiniBuffer()
     const QString pos = QString::fromLatin1("%1,%2").arg(l + 1).arg(cursorColumnInDocument() + 1);
     // FIXME: physical "-" logical
     if (linesInDoc != 0) {
-	status = FakeVimHandler::tr("%1%2%").arg(pos, -10).arg(l * 100 / linesInDoc, 4);
+        status = FakeVimHandler::tr("%1%2%").arg(pos, -10).arg(l * 100 / linesInDoc, 4);
     } else {
-	status = FakeVimHandler::tr("%1All").arg(pos, -10);
+        status = FakeVimHandler::tr("%1All").arg(pos, -10);
     }
     emit q->statusDataChanged(status);
 }
@@ -974,7 +974,7 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
         setDotCommand("%1dd", count());
         m_submode = NoSubMode;
         moveToFirstNonBlankOnLine();
-        setTargetColumn(); 
+        setTargetColumn();
         finishMovement();
     } else if (m_submode == ShiftLeftSubMode && key == '<') {
         setAnchor();
@@ -1529,7 +1529,7 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
         m_savedYankPosition = position();
         setAnchor(firstPositionInLine(line));
         setPosition(lastPositionInLine(line+count() - 1));
-        if (count() > 1) 
+        if (count() > 1)
             showBlackMessage(QString("%1 lines yanked").arg(count()));
         m_rangemode = RangeLineMode;
         m_movetype = MoveLineWise;
@@ -1666,7 +1666,7 @@ EventResult FakeVimHandler::Private::handleInsertMode(int key, int,
         insertAutomaticIndentation(true);
         setTargetColumn();
     } else if (key == Key_Backspace || key == control('h')) {
-        if (!removeAutomaticIndentation()) 
+        if (!removeAutomaticIndentation())
             if (!m_lastInsertion.isEmpty() || hasConfig(ConfigBackspace, "start")) {
                 m_tc.deletePreviousChar();
                 m_lastInsertion.chop(1);
@@ -1899,7 +1899,7 @@ void FakeVimHandler::Private::handleExCommand(const QString &cmd0)
     static QRegExp reSet("^set?( (.*))?$");
     static QRegExp reWrite("^[wx]q?a?!?( (.*))?$");
     static QRegExp reSubstitute("^s(.)(.*)\\1(.*)\\1([gi]*)");
-    
+
     enterCommandMode();
     showBlackMessage(QString());
 
@@ -2509,12 +2509,12 @@ QString FakeVimHandler::Private::text(const Range &range) const
     int beginColumn = 0;
     int endColumn = INT_MAX;
     if (range.rangemode == RangeBlockMode) {
-        int column1 = range.beginPos - firstPositionInLine(beginLine); 
-        int column2 = range.endPos - firstPositionInLine(endLine); 
+        int column1 = range.beginPos - firstPositionInLine(beginLine);
+        int column2 = range.endPos - firstPositionInLine(endLine);
         beginColumn = qMin(column1, column2);
         endColumn = qMax(column1, column2);
         qDebug() << "COLS: " << beginColumn << endColumn;
-    } 
+    }
     int len = endColumn - beginColumn + 1;
     QString contents;
     QTextBlock block = m_tc.document()->findBlockByNumber(beginLine - 1);
@@ -2580,8 +2580,8 @@ void FakeVimHandler::Private::removeText(const Range &range)
         case RangeBlockMode: {
             int beginLine = lineForPosition(range.beginPos);
             int endLine = lineForPosition(range.endPos);
-            int column1 = range.beginPos - firstPositionInLine(beginLine); 
-            int column2 = range.endPos - firstPositionInLine(endLine); 
+            int column1 = range.beginPos - firstPositionInLine(beginLine);
+            int column2 = range.endPos - firstPositionInLine(endLine);
             int beginColumn = qMin(column1, column2);
             int endColumn = qMax(column1, column2);
             qDebug() << "COLS: " << beginColumn << endColumn;
@@ -2645,7 +2645,7 @@ void FakeVimHandler::Private::pasteText(bool afterCursor)
                     tc.movePosition(EndOfLine, MoveAnchor);
                     fixMarks(position(), QString(col - line.size() + 1, QChar(' ')).length());
                     tc.insertText(QString(col - line.size() + 1, QChar(' ')));
-                } else { 
+                } else {
                     tc.movePosition(Right, MoveAnchor, col);
                 }
                 qDebug() << "INSERT " << line << " AT " << tc.position()
@@ -2673,8 +2673,8 @@ void FakeVimHandler::Private::fixMarks(int positionAction, int positionChange)
     QHashIterator<int, int> i(m_marks);
     while (i.hasNext()) {
         i.next();
-        if (i.value() >= positionAction) { 
-            if (i.value() + positionChange > 0) 
+        if (i.value() >= positionAction) {
+            if (i.value() + positionChange > 0)
                 m_marks[i.key()] = i.value() + positionChange;
             else
                 m_marks.remove(i.key());
diff --git a/src/plugins/help/Help.pluginspec b/src/plugins/help/Help.pluginspec
index 872523db80327bac0360875e1bfd880f2eef5c99..4248b289b2ba807f3855aa6491c431db557186c9 100644
--- a/src/plugins/help/Help.pluginspec
+++ b/src/plugins/help/Help.pluginspec
@@ -21,6 +21,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <dependencyList>
         <dependency name="Core" version="1.2.93"/>
         <dependency name="Find" version="1.2.93"/>
-        <dependency name="QuickOpen" version="1.2.93"/>
+        <dependency name="Locator" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/help/help_dependencies.pri b/src/plugins/help/help_dependencies.pri
index 2b46febe3b5a232ae6caf2f3d1fc3508ef3777c4..1d3fd6128c35eda4cd865c3b64769a0fb7cf5cbf 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/locator.pri)
 
diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp
index 47f9e1cb95fc6374e302d7c5035602ed0089c3bd..162c3d57a694d9239773c204805c4831e9b11e42 100644
--- a/src/plugins/help/helpindexfilter.cpp
+++ b/src/plugins/help/helpindexfilter.cpp
@@ -37,11 +37,11 @@
 #include <QtHelp/QHelpEngine>
 #include <QtHelp/QHelpIndexModel>
 
-using namespace QuickOpen;
+using namespace Locator;
 using namespace Help;
 using namespace Help::Internal;
 
-Q_DECLARE_METATYPE(IQuickOpenFilter*);
+Q_DECLARE_METATYPE(ILocatorFilter*);
 
 HelpIndexFilter::HelpIndexFilter(HelpPlugin *plugin, QHelpEngine *helpEngine):
     m_plugin(plugin),
@@ -77,7 +77,7 @@ QString HelpIndexFilter::name() const
     return QLatin1String("HelpIndexFilter");
 }
 
-IQuickOpenFilter::Priority HelpIndexFilter::priority() const
+ILocatorFilter::Priority HelpIndexFilter::priority() const
 {
     return Medium;
 }
diff --git a/src/plugins/help/helpindexfilter.h b/src/plugins/help/helpindexfilter.h
index 489e68c1e429a04664f1fa51c326432cc2a585fe..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/iquickopenfilter.h>
+#include <locator/ilocatorfilter.h>
 
 #include <QtGui/QIcon>
 
@@ -44,19 +44,19 @@ namespace Internal {
 
 class HelpPlugin;
 
-class HelpIndexFilter : public QuickOpen::IQuickOpenFilter
+class HelpIndexFilter : public Locator::ILocatorFilter
 {
     Q_OBJECT
 
 public:
     HelpIndexFilter(HelpPlugin *plugin, QHelpEngine *helpEngine);
 
-    // IQuickOpenFilter
+    // ILocatorFilter
     QString trName() const;
     QString name() const;
     Priority priority() const;
-    QList<QuickOpen::FilterEntry> matchesFor(const QString &entry);
-    void accept(QuickOpen::FilterEntry selection) const;
+    QList<Locator::FilterEntry> matchesFor(const QString &entry);
+    void accept(Locator::FilterEntry selection) const;
     void refresh(QFutureInterface<void> &future);
 
 signals:
diff --git a/src/plugins/quickopen/QuickOpen.pluginspec b/src/plugins/locator/Locator.pluginspec
similarity index 83%
rename from src/plugins/quickopen/QuickOpen.pluginspec
rename to src/plugins/locator/Locator.pluginspec
index d9a45e89ba7f11bd19b9a600e4c60adda6e5a8b8..a49f8670407e18ef89a5134ddcda40fcdc367408 100644
--- a/src/plugins/quickopen/QuickOpen.pluginspec
+++ b/src/plugins/locator/Locator.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="QuickOpen" version="1.2.93" compatVersion="1.2.93">
+<plugin name="Locator" version="1.2.93" compatVersion="1.2.93">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -16,7 +16,7 @@ General Public License version 2.1 as published by the Free Software
 Foundation.  Please review the following information to
 ensure the GNU Lesser General Public License version 2.1 requirements
 will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
-    <description>Provides the Locator widget and the hooks for QuickOpen filter implementations.</description>
+    <description>Provides the Locator widget and the hooks for Locator filter implementations.</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
         <dependency name="Core" version="1.2.93"/>
diff --git a/src/plugins/quickopen/basefilefilter.cpp b/src/plugins/locator/basefilefilter.cpp
similarity index 96%
rename from src/plugins/quickopen/basefilefilter.cpp
rename to src/plugins/locator/basefilefilter.cpp
index 7b27c185accf68bf9a6811a57d669b9d7ad1ac9f..ed5e02f76ade6a30a36ce76a5f2dea4a661c8ff0 100644
--- a/src/plugins/quickopen/basefilefilter.cpp
+++ b/src/plugins/locator/basefilefilter.cpp
@@ -35,7 +35,7 @@
 #include <QtCore/QStringMatcher>
 
 using namespace Core;
-using namespace QuickOpen;
+using namespace Locator;
 
 BaseFileFilter::BaseFileFilter()
   : m_forceNewSearchList(false)
@@ -85,12 +85,12 @@ QList<FilterEntry> BaseFileFilter::matchesFor(const QString &origEntry)
             m_previousResultNames.append(name);
         }
     }
-   
-    matches.append(badMatches); 
+
+    matches.append(badMatches);
     return matches;
 }
 
-void BaseFileFilter::accept(QuickOpen::FilterEntry selection) const
+void BaseFileFilter::accept(Locator::FilterEntry selection) const
 {
     Core::EditorManager *em = Core::EditorManager::instance();
     em->openEditor(selection.internalData.toString());
diff --git a/src/plugins/quickopen/basefilefilter.h b/src/plugins/locator/basefilefilter.h
similarity index 84%
rename from src/plugins/quickopen/basefilefilter.h
rename to src/plugins/locator/basefilefilter.h
index b95e6a61b9cef7b38ef919398c0f59c37c3ccd58..ee2e4248c9ec392557af24bf5e7fab127afd6f35 100644
--- a/src/plugins/quickopen/basefilefilter.h
+++ b/src/plugins/locator/basefilefilter.h
@@ -30,22 +30,22 @@
 #ifndef BASEFILEFILTER_H
 #define BASEFILEFILTER_H
 
-#include "quickopen_global.h"
-#include "iquickopenfilter.h"
+#include "locator_global.h"
+#include "ilocatorfilter.h"
 
 #include <QtCore/QString>
 #include <QtCore/QList>
 
-namespace QuickOpen {
+namespace Locator {
 
-class QUICKOPEN_EXPORT BaseFileFilter : public QuickOpen::IQuickOpenFilter
+class LOCATOR_EXPORT BaseFileFilter : public Locator::ILocatorFilter
 {
     Q_OBJECT
 
 public:
     BaseFileFilter();
-    QList<QuickOpen::FilterEntry> matchesFor(const QString &entry);
-    void accept(QuickOpen::FilterEntry selection) const;
+    QList<Locator::FilterEntry> matchesFor(const QString &entry);
+    void accept(Locator::FilterEntry selection) const;
 
 protected:
     virtual void updateFiles();
@@ -59,6 +59,6 @@ protected:
     QString m_previousEntry;
 };
 
-} // namespace QuickOpen
+} // namespace Locator
 
 #endif // BASEFILEFILTER_H
diff --git a/src/plugins/quickopen/directoryfilter.cpp b/src/plugins/locator/directoryfilter.cpp
similarity index 99%
rename from src/plugins/quickopen/directoryfilter.cpp
rename to src/plugins/locator/directoryfilter.cpp
index fc7e1f8cea4b7697df41480148fe4bbb9f33920e..983b51c92e85ebf0b05263c0aef752db04dc1ff9 100644
--- a/src/plugins/quickopen/directoryfilter.cpp
+++ b/src/plugins/locator/directoryfilter.cpp
@@ -37,8 +37,8 @@
 
 #include <qtconcurrent/QtConcurrentTools>
 
-using namespace QuickOpen;
-using namespace QuickOpen::Internal;
+using namespace Locator;
+using namespace Locator::Internal;
 
 DirectoryFilter::DirectoryFilter()
   : m_name(tr("Generic Directory Filter")),
diff --git a/src/plugins/quickopen/directoryfilter.h b/src/plugins/locator/directoryfilter.h
similarity index 93%
rename from src/plugins/quickopen/directoryfilter.h
rename to src/plugins/locator/directoryfilter.h
index a448dfacdd748c9f25d621c17a2fe07e888d21c3..2140a18d1ff3eaa0912646cbb4d8225d1aead859 100644
--- a/src/plugins/quickopen/directoryfilter.h
+++ b/src/plugins/locator/directoryfilter.h
@@ -41,7 +41,7 @@
 #include <QtGui/QWidget>
 #include <QtGui/QDialog>
 
-namespace QuickOpen {
+namespace Locator {
 namespace Internal {
 
 class DirectoryFilter : public BaseFileFilter
@@ -52,7 +52,7 @@ public:
     DirectoryFilter();
     QString trName() const { return m_name; }
     QString name() const { return m_name; }
-    QuickOpen::IQuickOpenFilter::Priority priority() const { return QuickOpen::IQuickOpenFilter::Medium; }
+    Locator::ILocatorFilter::Priority priority() const { return Locator::ILocatorFilter::Medium; }
     QByteArray saveState() const;
     bool restoreState(const QByteArray &state);
     bool openConfigDialog(QWidget *parent, bool &needsRefresh);
@@ -76,6 +76,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace QuickOpen
+} // namespace Locator
 
 #endif // DIRECTORYFILTER_H
diff --git a/src/plugins/quickopen/directoryfilter.ui b/src/plugins/locator/directoryfilter.ui
similarity index 94%
rename from src/plugins/quickopen/directoryfilter.ui
rename to src/plugins/locator/directoryfilter.ui
index fbc5f82ae263a37fcb081e72d1ae67f97309d4b2..8b8ddfe59a8346acf69edf99f916672d9e8d0688 100644
--- a/src/plugins/quickopen/directoryfilter.ui
+++ b/src/plugins/locator/directoryfilter.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>QuickOpen::Internal::DirectoryFilterOptions</class>
- <widget class="QDialog" name="QuickOpen::Internal::DirectoryFilterOptions">
+ <class>Locator::Internal::DirectoryFilterOptions</class>
+ <widget class="QDialog" name="Locator::Internal::DirectoryFilterOptions">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>393</width>
-    <height>271</height>
+    <height>275</height>
    </rect>
   </property>
   <layout class="QGridLayout">
@@ -72,12 +72,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="checked">
-        <bool>false</bool>
-       </property>
        <property name="text">
         <string>Limit to prefix</string>
        </property>
+       <property name="checked">
+        <bool>false</bool>
+       </property>
       </widget>
      </item>
      <item row="1" column="3">
@@ -161,7 +161,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>QuickOpen::Internal::DirectoryFilterOptions</receiver>
+   <receiver>Locator::Internal::DirectoryFilterOptions</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -177,7 +177,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>QuickOpen::Internal::DirectoryFilterOptions</receiver>
+   <receiver>Locator::Internal::DirectoryFilterOptions</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/src/plugins/quickopen/filesystemfilter.cpp b/src/plugins/locator/filesystemfilter.cpp
similarity index 94%
rename from src/plugins/quickopen/filesystemfilter.cpp
rename to src/plugins/locator/filesystemfilter.cpp
index d62d5279bb96e22aa996a25077686299af5ac47b..99506b0760cf7d056be139b63eb8b943e9c45ec7 100644
--- a/src/plugins/quickopen/filesystemfilter.cpp
+++ b/src/plugins/locator/filesystemfilter.cpp
@@ -28,17 +28,17 @@
 **************************************************************************/
 
 #include "filesystemfilter.h"
-#include "quickopentoolwindow.h"
+#include "locatorwidget.h"
 #include <coreplugin/editormanager/ieditor.h>
 
 #include <QtCore/QDir>
 
 using namespace Core;
-using namespace QuickOpen;
-using namespace QuickOpen::Internal;
+using namespace Locator;
+using namespace Locator::Internal;
 
-FileSystemFilter::FileSystemFilter(EditorManager *editorManager, QuickOpenToolWindow *toolWindow)
-        : m_editorManager(editorManager), m_toolWindow(toolWindow), m_includeHidden(true)
+FileSystemFilter::FileSystemFilter(EditorManager *editorManager, LocatorWidget *locatorWidget)
+        : m_editorManager(editorManager), m_locatorWidget(locatorWidget), m_includeHidden(true)
 {
     setShortcutString("f");
     setIncludedByDefault(false);
@@ -96,7 +96,7 @@ void FileSystemFilter::accept(FilterEntry selection) const
     QFileInfo info(selection.internalData.toString());
     if (info.isDir()) {
         QString value = shortcutString() + " " + QDir::toNativeSeparators(info.absoluteFilePath()+"/");
-        m_toolWindow->show(value, value.length());
+        m_locatorWidget->show(value, value.length());
         return;
     }
     m_editorManager->openEditor(selection.internalData.toString());
diff --git a/src/plugins/quickopen/filesystemfilter.h b/src/plugins/locator/filesystemfilter.h
similarity index 79%
rename from src/plugins/quickopen/filesystemfilter.h
rename to src/plugins/locator/filesystemfilter.h
index 454a3dbd7617d32603585f353920d84cea08a5e0..319637192a8a8ade273268bd3573ba4da27cc28f 100644
--- a/src/plugins/quickopen/filesystemfilter.h
+++ b/src/plugins/locator/filesystemfilter.h
@@ -30,7 +30,7 @@
 #ifndef FILESYSTEMFILTER_H
 #define FILESYSTEMFILTER_H
 
-#include "iquickopenfilter.h"
+#include "ilocatorfilter.h"
 #include "ui_filesystemfilter.h"
 
 #include <coreplugin/editormanager/editormanager.h>
@@ -40,22 +40,22 @@
 #include <QtCore/QByteArray>
 #include <QtCore/QFutureInterface>
 
-namespace QuickOpen {
+namespace Locator {
 namespace Internal {
 
-class QuickOpenToolWindow;
+class LocatorWidget;
 
-class FileSystemFilter : public QuickOpen::IQuickOpenFilter
+class FileSystemFilter : public Locator::ILocatorFilter
 {
     Q_OBJECT
 
 public:
-    FileSystemFilter(Core::EditorManager *editorManager, QuickOpenToolWindow *toolWindow);
+    FileSystemFilter(Core::EditorManager *editorManager, LocatorWidget *locatorWidget);
     QString trName() const { return tr("Files in file system"); }
     QString name() const { return "Files in file system"; }
-    QuickOpen::IQuickOpenFilter::Priority priority() const { return QuickOpen::IQuickOpenFilter::Medium; }
-    QList<QuickOpen::FilterEntry> matchesFor(const QString &entry);
-    void accept(QuickOpen::FilterEntry selection) const;
+    Locator::ILocatorFilter::Priority priority() const { return Locator::ILocatorFilter::Medium; }
+    QList<Locator::FilterEntry> matchesFor(const QString &entry);
+    void accept(Locator::FilterEntry selection) const;
     QByteArray saveState() const;
     bool restoreState(const QByteArray &state);
     bool openConfigDialog(QWidget *parent, bool &needsRefresh);
@@ -63,11 +63,11 @@ public:
 
 private:
     Core::EditorManager *m_editorManager;
-    QuickOpenToolWindow *m_toolWindow;
+    LocatorWidget *m_locatorWidget;
     bool m_includeHidden;
 };
 
 } // namespace Internal
-} // namespace QuickOpen
+} // namespace Locator
 
 #endif // FILESYSTEMFILTER_H
diff --git a/src/plugins/quickopen/filesystemfilter.ui b/src/plugins/locator/filesystemfilter.ui
similarity index 89%
rename from src/plugins/quickopen/filesystemfilter.ui
rename to src/plugins/locator/filesystemfilter.ui
index c9a3ed3a51b12ab864520c6e94f6010a8d66c5a0..0c56a860320909a27dcd0819fc096373cfb13127 100644
--- a/src/plugins/quickopen/filesystemfilter.ui
+++ b/src/plugins/locator/filesystemfilter.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>QuickOpen::Internal::FileSystemFilterOptions</class>
- <widget class="QDialog" name="QuickOpen::Internal::FileSystemFilterOptions">
+ <class>Locator::Internal::FileSystemFilterOptions</class>
+ <widget class="QDialog" name="Locator::Internal::FileSystemFilterOptions">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>327</width>
+    <width>335</width>
     <height>131</height>
    </rect>
   </property>
@@ -78,7 +78,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>QuickOpen::Internal::FileSystemFilterOptions</receiver>
+   <receiver>Locator::Internal::FileSystemFilterOptions</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -94,7 +94,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>QuickOpen::Internal::FileSystemFilterOptions</receiver>
+   <receiver>Locator::Internal::FileSystemFilterOptions</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/src/plugins/quickopen/iquickopenfilter.cpp b/src/plugins/locator/ilocatorfilter.cpp
similarity index 83%
rename from src/plugins/quickopen/iquickopenfilter.cpp
rename to src/plugins/locator/ilocatorfilter.cpp
index b2d0a5aecb7d73de7dbcb826f29f17d44d4c14e8..fb9c682eac583c8698e75b1fb2205e4e3f6f2938 100644
--- a/src/plugins/quickopen/iquickopenfilter.cpp
+++ b/src/plugins/locator/ilocatorfilter.cpp
@@ -27,7 +27,7 @@
 **
 **************************************************************************/
 
-#include "iquickopenfilter.h"
+#include "ilocatorfilter.h"
 
 #include <QtGui/QBoxLayout>
 #include <QtGui/QCheckBox>
@@ -36,26 +36,26 @@
 #include <QtGui/QLabel>
 #include <QtGui/QLineEdit>
 
-using namespace QuickOpen;
+using namespace Locator;
 
-IQuickOpenFilter::IQuickOpenFilter(QObject *parent):
+ILocatorFilter::ILocatorFilter(QObject *parent):
     QObject(parent),
     m_includedByDefault(false),
     m_hidden(false)
 {
 }
 
-QString IQuickOpenFilter::shortcutString() const
+QString ILocatorFilter::shortcutString() const
 {
     return m_shortcut;
 }
 
-void IQuickOpenFilter::setShortcutString(const QString &shortcut)
+void ILocatorFilter::setShortcutString(const QString &shortcut)
 {
     m_shortcut = shortcut;
 }
 
-QByteArray IQuickOpenFilter::saveState() const
+QByteArray ILocatorFilter::saveState() const
 {
     QByteArray value;
     QDataStream out(&value, QIODevice::WriteOnly);
@@ -64,7 +64,7 @@ QByteArray IQuickOpenFilter::saveState() const
     return value;
 }
 
-bool IQuickOpenFilter::restoreState(const QByteArray &state)
+bool ILocatorFilter::restoreState(const QByteArray &state)
 {
     QString shortcut;
     bool defaultFilter;
@@ -78,7 +78,7 @@ bool IQuickOpenFilter::restoreState(const QByteArray &state)
     return true;
 }
 
-bool IQuickOpenFilter::openConfigDialog(QWidget *parent, bool &needsRefresh)
+bool ILocatorFilter::openConfigDialog(QWidget *parent, bool &needsRefresh)
 {
     Q_UNUSED(needsRefresh)
 
@@ -113,27 +113,27 @@ bool IQuickOpenFilter::openConfigDialog(QWidget *parent, bool &needsRefresh)
     return false;
 }
 
-bool IQuickOpenFilter::isConfigurable() const
+bool ILocatorFilter::isConfigurable() const
 {
     return true;
 }
 
-bool IQuickOpenFilter::isIncludedByDefault() const
+bool ILocatorFilter::isIncludedByDefault() const
 {
     return m_includedByDefault;
 }
 
-void IQuickOpenFilter::setIncludedByDefault(bool includedByDefault)
+void ILocatorFilter::setIncludedByDefault(bool includedByDefault)
 {
     m_includedByDefault = includedByDefault;
 }
 
-bool IQuickOpenFilter::isHidden() const
+bool ILocatorFilter::isHidden() const
 {
     return m_hidden;
 }
 
-void IQuickOpenFilter::setHidden(bool hidden)
+void ILocatorFilter::setHidden(bool hidden)
 {
     m_hidden = hidden;
 }
diff --git a/src/plugins/quickopen/iquickopenfilter.h b/src/plugins/locator/ilocatorfilter.h
similarity index 91%
rename from src/plugins/quickopen/iquickopenfilter.h
rename to src/plugins/locator/ilocatorfilter.h
index 3d6eba5adc6215ee25fb11e9c5a6e07cd1464a11..4957eecd053a6d6a9f62b7442adcb535f7bf8740 100644
--- a/src/plugins/quickopen/iquickopenfilter.h
+++ b/src/plugins/locator/ilocatorfilter.h
@@ -27,24 +27,24 @@
 **
 **************************************************************************/
 
-#ifndef IQUICKOPENFILTER_H
-#define IQUICKOPENFILTER_H
+#ifndef ILOCATORFILTER_H
+#define ILOCATORFILTER_H
 
-#include "quickopen_global.h"
+#include "locator_global.h"
 
 #include <QtCore/QDir>
 #include <QtCore/QVariant>
 #include <QtCore/QFutureInterface>
 #include <QtGui/QIcon>
 
-namespace QuickOpen {
+namespace Locator {
 
-class IQuickOpenFilter;
+class ILocatorFilter;
 
 struct FilterEntry
 {
     FilterEntry() {}
-    FilterEntry(IQuickOpenFilter *fromFilter, const QString &name, const QVariant &data,
+    FilterEntry(ILocatorFilter *fromFilter, const QString &name, const QVariant &data,
                 const QIcon &icon = QIcon())
     : filter(fromFilter)
     , displayName(name)
@@ -60,7 +60,7 @@ struct FilterEntry
     }
 
     /* backpointer to creating filter */
-    IQuickOpenFilter *filter;
+    ILocatorFilter *filter;
     /* displayed string */
     QString displayName;
     /* extra information displayed in light-gray in a second column (optional) */
@@ -73,15 +73,15 @@ struct FilterEntry
     bool resolveFileIcon;
 };
 
-class QUICKOPEN_EXPORT IQuickOpenFilter : public QObject
+class LOCATOR_EXPORT ILocatorFilter : public QObject
 {
     Q_OBJECT
 
 public:
     enum Priority {High = 0, Medium = 1, Low = 2};
 
-    IQuickOpenFilter(QObject *parent = 0);
-    virtual ~IQuickOpenFilter() {}
+    ILocatorFilter(QObject *parent = 0);
+    virtual ~ILocatorFilter() {}
 
     /* Visible name. */
     virtual QString trName() const = 0;
@@ -151,6 +151,6 @@ private:
     bool m_hidden;
 };
 
-} // namespace QuickOpen
+} // namespace Locator
 
-#endif // IQUICKOPENFILTER_H
+#endif // ILOCATORFILTER_H
diff --git a/src/plugins/quickopen/images/quickopen.png b/src/plugins/locator/images/locator.png
similarity index 100%
rename from src/plugins/quickopen/images/quickopen.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/locator/locator.pri b/src/plugins/locator/locator.pri
new file mode 100644
index 0000000000000000000000000000000000000000..1eb758b80e6e82fae45ba74df969d7f74d6a67f2
--- /dev/null
+++ b/src/plugins/locator/locator.pri
@@ -0,0 +1,3 @@
+include(locator_dependencies.pri)
+
+LIBS *= -l$$qtLibraryTarget(Locator)
diff --git a/src/plugins/locator/locator.pro b/src/plugins/locator/locator.pro
new file mode 100644
index 0000000000000000000000000000000000000000..e3d8832651f12d059ef24feb0f10693fd4e4826b
--- /dev/null
+++ b/src/plugins/locator/locator.pro
@@ -0,0 +1,33 @@
+TEMPLATE = lib
+TARGET = Locator
+DEFINES += LOCATOR_LIBRARY
+include(../../qtcreatorplugin.pri)
+include(locator_dependencies.pri)
+HEADERS += locatorplugin.h \
+    locatorwidget.h \
+    locatorfiltersfilter.h \
+    settingspage.h \
+    ilocatorfilter.h \
+    opendocumentsfilter.h \
+    filesystemfilter.h \
+    locatorconstants.h \
+    directoryfilter.h \
+    locatormanager.h \
+    basefilefilter.h \
+    locator_global.h
+SOURCES += locatorplugin.cpp \
+    locatorwidget.cpp \
+    locatorfiltersfilter.cpp \
+    opendocumentsfilter.cpp \
+    filesystemfilter.cpp \
+    settingspage.cpp \
+    directoryfilter.cpp \
+    locatormanager.cpp \
+    basefilefilter.cpp \
+    ilocatorfilter.cpp
+FORMS += settingspage.ui \
+    filesystemfilter.ui \
+    directoryfilter.ui
+RESOURCES += locator.qrc
+
+OTHER_FILES += Locator.pluginspec
diff --git a/src/plugins/locator/locator.qrc b/src/plugins/locator/locator.qrc
new file mode 100644
index 0000000000000000000000000000000000000000..4cd5df4f13dbaece9e89697c725b23418d4b4537
--- /dev/null
+++ b/src/plugins/locator/locator.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/locator">
+        <file>images/reload.png</file>
+        <file>images/locator.png</file>
+    </qresource>
+</RCC>
diff --git a/src/plugins/quickopen/quickopen_dependencies.pri b/src/plugins/locator/locator_dependencies.pri
similarity index 100%
rename from src/plugins/quickopen/quickopen_dependencies.pri
rename to src/plugins/locator/locator_dependencies.pri
diff --git a/src/plugins/quickopen/quickopen_global.h b/src/plugins/locator/locator_global.h
similarity index 86%
rename from src/plugins/quickopen/quickopen_global.h
rename to src/plugins/locator/locator_global.h
index 9b91cdad5fb6c20b34bbcce34e913bbe9f697fb0..7dc95b7fdee0c053151970cc46232a8b28fb5d59 100644
--- a/src/plugins/quickopen/quickopen_global.h
+++ b/src/plugins/locator/locator_global.h
@@ -27,15 +27,15 @@
 **
 **************************************************************************/
 
-#ifndef QUICKOPEN_GLOBAL_H
-#define QUICKOPEN_GLOBAL_H
+#ifndef LOCATOR_GLOBAL_H
+#define LOCATOR_GLOBAL_H
 
 #include <QtCore/qglobal.h>
 
-#if defined(QUICKOPEN_LIBRARY)
-#  define QUICKOPEN_EXPORT Q_DECL_EXPORT
+#if defined(LOCATOR_LIBRARY)
+#  define LOCATOR_EXPORT Q_DECL_EXPORT
 #else
-#  define QUICKOPEN_EXPORT Q_DECL_IMPORT
+#  define LOCATOR_EXPORT Q_DECL_IMPORT
 #endif
 
-#endif // QUICKOPEN_GLOBAL_H
+#endif // LOCATOR_GLOBAL_H
diff --git a/src/plugins/quickopen/quickopenconstants.h b/src/plugins/locator/locatorconstants.h
similarity index 83%
rename from src/plugins/quickopen/quickopenconstants.h
rename to src/plugins/locator/locatorconstants.h
index 37b30db9e1a59dbc84704d003f6acf8ccf204c51..4a78341f79e9cb88bc0be1ceefe22ae40d430735 100644
--- a/src/plugins/quickopen/quickopenconstants.h
+++ b/src/plugins/locator/locatorconstants.h
@@ -27,19 +27,19 @@
 **
 **************************************************************************/
 
-#ifndef QUICKOPENCONSTANTS_H
-#define QUICKOPENCONSTANTS_H
+#ifndef LOCATORCONSTANTS_H
+#define LOCATORCONSTANTS_H
 
 #include <QtCore/QtGlobal>
 
-namespace QuickOpen {
+namespace Locator {
 namespace Constants {
 
 const char * const FILTER_OPTIONS_PAGE = QT_TRANSLATE_NOOP("Locator", "Filters");
-const char * const QUICKOPEN_CATEGORY = QT_TRANSLATE_NOOP("Locator", "Locator");
-const char * const TASK_INDEX = "QuickOpen.Task.Index";
+const char * const LOCATOR_CATEGORY = QT_TRANSLATE_NOOP("Locator", "Locator");
+const char * const TASK_INDEX = "Locator.Task.Index";
 
 } // namespace Constants
-} // namespace QuickOpen
+} // namespace Locator
 
-#endif // QUICKOPENCONSTANTS_H
+#endif // LOCATORCONSTANTS_H
diff --git a/src/plugins/quickopen/quickopenfiltersfilter.cpp b/src/plugins/locator/locatorfiltersfilter.cpp
similarity index 68%
rename from src/plugins/quickopen/quickopenfiltersfilter.cpp
rename to src/plugins/locator/locatorfiltersfilter.cpp
index 6fac741a71b97b4b4a88d8b55607651bb7341bf0..4b81b73e5d3bf18c1567546b7472bbf00753caa2 100644
--- a/src/plugins/quickopen/quickopenfiltersfilter.cpp
+++ b/src/plugins/locator/locatorfiltersfilter.cpp
@@ -27,47 +27,47 @@
 **
 **************************************************************************/
 
-#include "quickopenfiltersfilter.h"
-#include "quickopenplugin.h"
-#include "quickopentoolwindow.h"
+#include "locatorfiltersfilter.h"
+#include "locatorplugin.h"
+#include "locatorwidget.h"
 
 #include <coreplugin/coreconstants.h>
 
-using namespace QuickOpen;
-using namespace QuickOpen::Internal;
+using namespace Locator;
+using namespace Locator::Internal;
 
-Q_DECLARE_METATYPE(IQuickOpenFilter*);
+Q_DECLARE_METATYPE(ILocatorFilter*);
 
-QuickOpenFiltersFilter::QuickOpenFiltersFilter(QuickOpenPlugin *plugin,
-                                               QuickOpenToolWindow *toolWindow):
+LocatorFiltersFilter::LocatorFiltersFilter(LocatorPlugin *plugin,
+                                               LocatorWidget *locatorWidget):
     m_plugin(plugin),
-    m_toolWindow(toolWindow),
+    m_locatorWidget(locatorWidget),
     m_icon(QIcon(Core::Constants::ICON_NEXT))
 {
     setIncludedByDefault(true);
     setHidden(true);
 }
 
-QString QuickOpenFiltersFilter::trName() const
+QString LocatorFiltersFilter::trName() const
 {
     return tr("Available filters");
 }
 
-QString QuickOpenFiltersFilter::name() const
+QString LocatorFiltersFilter::name() const
 {
     return QLatin1String("FiltersFilter");
 }
 
-IQuickOpenFilter::Priority QuickOpenFiltersFilter::priority() const
+ILocatorFilter::Priority LocatorFiltersFilter::priority() const
 {
     return High;
 }
 
-QList<FilterEntry> QuickOpenFiltersFilter::matchesFor(const QString &entry)
+QList<FilterEntry> LocatorFiltersFilter::matchesFor(const QString &entry)
 {
     QList<FilterEntry> entries;
     if (entry.isEmpty()) {
-        foreach (IQuickOpenFilter *filter, m_plugin->filters()) {
+        foreach (ILocatorFilter *filter, m_plugin->filters()) {
             if (!filter->shortcutString().isEmpty() && !filter->isHidden()) {
                 FilterEntry entry(this,
                                   filter->shortcutString(),
@@ -81,21 +81,21 @@ QList<FilterEntry> QuickOpenFiltersFilter::matchesFor(const QString &entry)
     return entries;
 }
 
-void QuickOpenFiltersFilter::accept(FilterEntry selection) const
+void LocatorFiltersFilter::accept(FilterEntry selection) const
 {
-    IQuickOpenFilter *filter = selection.internalData.value<IQuickOpenFilter*>();
+    ILocatorFilter *filter = selection.internalData.value<ILocatorFilter*>();
     if (filter)
-        m_toolWindow->show(filter->shortcutString() + " ",
+        m_locatorWidget->show(filter->shortcutString() + " ",
                            filter->shortcutString().length() + 1);
 }
 
-void QuickOpenFiltersFilter::refresh(QFutureInterface<void> &future)
+void LocatorFiltersFilter::refresh(QFutureInterface<void> &future)
 {
     Q_UNUSED(future)
     // Nothing to refresh
 }
 
-bool QuickOpenFiltersFilter::isConfigurable() const
+bool LocatorFiltersFilter::isConfigurable() const
 {
     return false;
 }
diff --git a/src/plugins/quickopen/quickopenfiltersfilter.h b/src/plugins/locator/locatorfiltersfilter.h
similarity index 74%
rename from src/plugins/quickopen/quickopenfiltersfilter.h
rename to src/plugins/locator/locatorfiltersfilter.h
index 5734cbcb8e7e2fd858f1b824a53d04390f6e598a..622b653f1a85174db5a5f43665d0744acd628a4b 100644
--- a/src/plugins/quickopen/quickopenfiltersfilter.h
+++ b/src/plugins/locator/locatorfiltersfilter.h
@@ -27,32 +27,32 @@
 **
 **************************************************************************/
 
-#ifndef QUICKOPENFILTERSFILTER_H
-#define QUICKOPENFILTERSFILTER_H
+#ifndef LOCATORFILTERSFILTER_H
+#define LOCATORFILTERSFILTER_H
 
-#include "iquickopenfilter.h"
+#include "ilocatorfilter.h"
 
 #include <QtGui/QIcon>
 
-namespace QuickOpen {
+namespace Locator {
 namespace Internal {
 
-class QuickOpenPlugin;
-class QuickOpenToolWindow;
+class LocatorPlugin;
+class LocatorWidget;
 
 /*!
-  This filter provides the user with the list of available QuickOpen filters.
+  This filter provides the user with the list of available Locator filters.
   The list is only shown when nothing has been typed yet.
  */
-class QuickOpenFiltersFilter : public IQuickOpenFilter
+class LocatorFiltersFilter : public ILocatorFilter
 {
     Q_OBJECT
 
 public:
-    QuickOpenFiltersFilter(QuickOpenPlugin *plugin,
-                           QuickOpenToolWindow *toolWindow);
+    LocatorFiltersFilter(LocatorPlugin *plugin,
+                           LocatorWidget *locatorWidget);
 
-    // IQuickOpenFilter
+    // ILocatorFilter
     QString trName() const;
     QString name() const;
     Priority priority() const;
@@ -62,12 +62,12 @@ public:
     bool isConfigurable() const;
 
 private:
-    QuickOpenPlugin *m_plugin;
-    QuickOpenToolWindow *m_toolWindow;
+    LocatorPlugin *m_plugin;
+    LocatorWidget *m_locatorWidget;
     QIcon m_icon;
 };
 
 } // namespace Internal
-} // namespace QuickOpen
+} // namespace Locator
 
-#endif // QUICKOPENFILTERSFILTER_H
+#endif // LOCATORFILTERSFILTER_H
diff --git a/src/plugins/quickopen/quickopenmanager.cpp b/src/plugins/locator/locatormanager.cpp
similarity index 75%
rename from src/plugins/quickopen/quickopenmanager.cpp
rename to src/plugins/locator/locatormanager.cpp
index aed22647c42c3223e56eeed212684a11e28a8aec..d1df7d8746f4f9e84e6cd704b1d761df9c6653f8 100644
--- a/src/plugins/quickopen/quickopenmanager.cpp
+++ b/src/plugins/locator/locatormanager.cpp
@@ -27,33 +27,33 @@
 **
 **************************************************************************/
 
-#include "quickopenmanager.h"
-#include "quickopentoolwindow.h"
+#include "locatormanager.h"
+#include "locatorwidget.h"
 
 #include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
 
-using namespace QuickOpen;
-using namespace QuickOpen::Internal;
+using namespace Locator;
+using namespace Locator::Internal;
 
-QuickOpenManager *QuickOpenManager::m_instance = 0;
+LocatorManager *LocatorManager::m_instance = 0;
 
-QuickOpenManager::QuickOpenManager(QuickOpenToolWindow *toolWindow)
-  : QObject(toolWindow),
-    m_toolWindow(toolWindow)
+LocatorManager::LocatorManager(LocatorWidget *locatorWidget)
+  : QObject(locatorWidget),
+    m_locatorWidget(locatorWidget)
 {
     m_instance = this;
 }
 
-QuickOpenManager::~QuickOpenManager()
+LocatorManager::~LocatorManager()
 {
     ExtensionSystem::PluginManager::instance()->removeObject(this);
     m_instance = 0;
 }
 
-void QuickOpenManager::show(const QString &text,
+void LocatorManager::show(const QString &text,
                             int selectionStart, int selectionLength)
 {
-    QTC_ASSERT(m_toolWindow, return);
-    m_toolWindow->show(text, selectionStart, selectionLength);
+    QTC_ASSERT(m_locatorWidget, return);
+    m_locatorWidget->show(text, selectionStart, selectionLength);
 }
diff --git a/src/plugins/quickopen/quickopenmanager.h b/src/plugins/locator/locatormanager.h
similarity index 74%
rename from src/plugins/quickopen/quickopenmanager.h
rename to src/plugins/locator/locatormanager.h
index e4b0d8ab0018c8e4c430984cbb037a90be9eb92b..d3f296c85e778b347c2158ad912182b95af1a406 100644
--- a/src/plugins/quickopen/quickopenmanager.h
+++ b/src/plugins/locator/locatormanager.h
@@ -27,36 +27,36 @@
 **
 **************************************************************************/
 
-#ifndef QUICKOPENMANAGER_H
-#define QUICKOPENMANAGER_H
+#ifndef LOCATORMANAGER_H
+#define LOCATORMANAGER_H
 
-#include "quickopen_global.h"
+#include "locator_global.h"
 
 #include <QtCore/QObject>
 
-namespace QuickOpen {
+namespace Locator {
 
 namespace Internal {
-class QuickOpenToolWindow;
+class LocatorWidget;
 }
 
-class QUICKOPEN_EXPORT QuickOpenManager : public QObject
+class LOCATOR_EXPORT LocatorManager : public QObject
 {
     Q_OBJECT
 
 public:
-    QuickOpenManager(Internal::QuickOpenToolWindow *toolWindow);
-    ~QuickOpenManager();
+    LocatorManager(Internal::LocatorWidget *locatorWidget);
+    ~LocatorManager();
 
-    static QuickOpenManager* instance() { return m_instance; }
+    static LocatorManager* instance() { return m_instance; }
 
     void show(const QString &text, int selectionStart = -1, int selectionLength = 0);
 
 private:
-    Internal::QuickOpenToolWindow *m_toolWindow;
-    static QuickOpenManager *m_instance;
+    Internal::LocatorWidget *m_locatorWidget;
+    static LocatorManager *m_instance;
 };
 
-} // namespace QuickOpen
+} // namespace Locator
 
-#endif // QUICKOPENMANAGER_H
+#endif // LOCATORMANAGER_H
diff --git a/src/plugins/quickopen/quickopenplugin.cpp b/src/plugins/locator/locatorplugin.cpp
similarity index 68%
rename from src/plugins/quickopen/quickopenplugin.cpp
rename to src/plugins/locator/locatorplugin.cpp
index e22074302ae0a4b8f1c7e5f7bf882abdbdc802f4..c37d218a1c8395cb61e0bd7646d894454e3d8d44 100644
--- a/src/plugins/quickopen/quickopenplugin.cpp
+++ b/src/plugins/locator/locatorplugin.cpp
@@ -27,11 +27,11 @@
 **
 **************************************************************************/
 
-#include "quickopenplugin.h"
-#include "quickopenconstants.h"
-#include "quickopenfiltersfilter.h"
-#include "quickopenmanager.h"
-#include "quickopentoolwindow.h"
+#include "locatorplugin.h"
+#include "locatorconstants.h"
+#include "locatorfiltersfilter.h"
+#include "locatormanager.h"
+#include "locatorwidget.h"
 #include "opendocumentsfilter.h"
 #include "filesystemfilter.h"
 #include "settingspage.h"
@@ -52,31 +52,31 @@
 #include <qtconcurrent/QtConcurrentTools>
 
 /*!
-    \namespace QuickOpen
-    The QuickOpen namespace provides the hooks for Locator content.
+    \namespace Locator
+    The Locator namespace provides the hooks for Locator content.
 */
 /*!
-    \namespace QuickOpen::Internal
+    \namespace Locator::Internal
     \internal
 */
 
-using namespace QuickOpen;
-using namespace QuickOpen::Internal;
+using namespace Locator;
+using namespace Locator::Internal;
 
 namespace {
-    static bool filterLessThan(const IQuickOpenFilter *first, const IQuickOpenFilter *second)
+    static bool filterLessThan(const ILocatorFilter *first, const ILocatorFilter *second)
     {
         return first->priority() < second->priority();
     }
 }
 
-QuickOpenPlugin::QuickOpenPlugin()
+LocatorPlugin::LocatorPlugin()
 {
     m_refreshTimer.setSingleShot(false);
     connect(&m_refreshTimer, SIGNAL(timeout()), this, SLOT(refresh()));
 }
 
-QuickOpenPlugin::~QuickOpenPlugin()
+LocatorPlugin::~LocatorPlugin()
 {
     removeObject(m_openDocumentsFilter);
     removeObject(m_fileSystemFilter);
@@ -87,63 +87,63 @@ QuickOpenPlugin::~QuickOpenPlugin()
     qDeleteAll(m_customFilters);
 }
 
-bool QuickOpenPlugin::initialize(const QStringList &, QString *)
+bool LocatorPlugin::initialize(const QStringList &, QString *)
 {
     Core::ICore *core = Core::ICore::instance();
     m_settingsPage = new SettingsPage(this);
     addObject(m_settingsPage);
 
-    m_quickOpenToolWindow = new QuickOpenToolWindow(this);
-    m_quickOpenToolWindow->setEnabled(false);
+    m_locatorWidget = new LocatorWidget(this);
+    m_locatorWidget->setEnabled(false);
     Core::BaseView *view = new Core::BaseView;
-    view->setUniqueViewName("QuickOpen");
-    view->setWidget(m_quickOpenToolWindow);
+    view->setUniqueViewName("Locator");
+    view->setWidget(m_locatorWidget);
     view->setContext(QList<int>() << core->uniqueIDManager()
-        ->uniqueIdentifier(QLatin1String("QuickOpenToolWindow")));
+        ->uniqueIdentifier(QLatin1String("LocatorWidget")));
     view->setDefaultPosition(Core::IView::First);
     addAutoReleasedObject(view);
 
     const QString actionId = QLatin1String("QtCreator.Locate");
-    QAction *action = new QAction(m_quickOpenToolWindow->windowIcon(), m_quickOpenToolWindow->windowTitle(), this);
+    QAction *action = new QAction(m_locatorWidget->windowIcon(), m_locatorWidget->windowTitle(), this);
     Core::Command *cmd = core->actionManager()->registerAction(action, actionId, QList<int>() << Core::Constants::C_GLOBAL_ID);
     cmd->setDefaultKeySequence(QKeySequence("Ctrl+K"));
-    connect(action, SIGNAL(triggered()), this, SLOT(openQuickOpen()));
+    connect(action, SIGNAL(triggered()), this, SLOT(openLocator()));
 
     Core::ActionContainer *mtools = core->actionManager()->actionContainer(Core::Constants::M_TOOLS);
     mtools->addAction(cmd);
 
-    addObject(new QuickOpenManager(m_quickOpenToolWindow));
+    addObject(new LocatorManager(m_locatorWidget));
 
     m_openDocumentsFilter = new OpenDocumentsFilter(core->editorManager());
     addObject(m_openDocumentsFilter);
 
-    m_fileSystemFilter = new FileSystemFilter(core->editorManager(), m_quickOpenToolWindow);
+    m_fileSystemFilter = new FileSystemFilter(core->editorManager(), m_locatorWidget);
     addObject(m_fileSystemFilter);
 
-    addAutoReleasedObject(new QuickOpenFiltersFilter(this, m_quickOpenToolWindow));
+    addAutoReleasedObject(new LocatorFiltersFilter(this, m_locatorWidget));
 
     connect(core, SIGNAL(coreOpened()), this, SLOT(startSettingsLoad()));
     return true;
 }
 
-void QuickOpenPlugin::openQuickOpen()
+void LocatorPlugin::openLocator()
 {
-    m_quickOpenToolWindow->show("");
+    m_locatorWidget->show("");
 }
 
-void QuickOpenPlugin::extensionsInitialized()
+void LocatorPlugin::extensionsInitialized()
 {
-    m_filters = ExtensionSystem::PluginManager::instance()->getObjects<IQuickOpenFilter>();
+    m_filters = ExtensionSystem::PluginManager::instance()->getObjects<ILocatorFilter>();
     qSort(m_filters.begin(), m_filters.end(), filterLessThan);
 }
 
-void QuickOpenPlugin::startSettingsLoad()
+void LocatorPlugin::startSettingsLoad()
 {
-    m_loadWatcher.setFuture(QtConcurrent::run(this, &QuickOpenPlugin::loadSettings));
+    m_loadWatcher.setFuture(QtConcurrent::run(this, &LocatorPlugin::loadSettings));
     connect(&m_loadWatcher, SIGNAL(finished()), this, SLOT(settingsLoaded()));
 }
 
-void QuickOpenPlugin::loadSettings()
+void LocatorPlugin::loadSettings()
 {
     Core::ICore *core = Core::ICore::instance();
     QSettings *qs = core->settings();
@@ -159,15 +159,15 @@ void QuickOpenPlugin::loadSettings()
     qs->remove("QuickOpen");
 }
 
-void QuickOpenPlugin::settingsLoaded()
+void LocatorPlugin::settingsLoaded()
 {
-    m_quickOpenToolWindow->updateFilterList();
-    m_quickOpenToolWindow->setEnabled(true);
+    m_locatorWidget->updateFilterList();
+    m_locatorWidget->setEnabled(true);
     if (m_refreshTimer.interval() > 0)
         m_refreshTimer.start();
 }
 
-void QuickOpenPlugin::saveSettings()
+void LocatorPlugin::saveSettings()
 {
     Core::ICore *core = Core::ICore::instance();
     if (core && core->settingsDatabase()) {
@@ -175,13 +175,13 @@ void QuickOpenPlugin::saveSettings()
         s->beginGroup("QuickOpen");
         s->remove("");
         s->setValue("RefreshInterval", refreshInterval());
-        foreach (IQuickOpenFilter *filter, m_filters) {
+        foreach (ILocatorFilter *filter, m_filters) {
             if (!m_customFilters.contains(filter))
                 s->setValue(filter->name(), filter->saveState());
         }
         s->beginGroup("CustomFilters");
         int i = 0;
-        foreach (IQuickOpenFilter *filter, m_customFilters) {
+        foreach (ILocatorFilter *filter, m_customFilters) {
             s->setValue(QString("directory%1").arg(i), filter->saveState());
             ++i;
         }
@@ -191,43 +191,43 @@ void QuickOpenPlugin::saveSettings()
 }
 
 /*!
-    \fn QList<IQuickOpenFilter*> QuickOpenPlugin::filter()
+    \fn QList<ILocatorFilter*> LocatorPlugin::filter()
 
     Return all filters, including the ones created by the user.
 */
-QList<IQuickOpenFilter*> QuickOpenPlugin::filters()
+QList<ILocatorFilter*> LocatorPlugin::filters()
 {
     return m_filters;
 }
 
 /*!
-    \fn QList<IQuickOpenFilter*> QuickOpenPlugin::customFilter()
+    \fn QList<ILocatorFilter*> LocatorPlugin::customFilter()
 
     This returns a subset of all the filters, that contains only the filters that
     have been created by the user at some point (maybe in a previous session).
  */
-QList<IQuickOpenFilter*> QuickOpenPlugin::customFilters()
+QList<ILocatorFilter*> LocatorPlugin::customFilters()
 {
     return m_customFilters;
 }
 
-void QuickOpenPlugin::setFilters(QList<IQuickOpenFilter*> f)
+void LocatorPlugin::setFilters(QList<ILocatorFilter*> f)
 {
     m_filters = f;
-    m_quickOpenToolWindow->updateFilterList();
+    m_locatorWidget->updateFilterList();
 }
 
-void QuickOpenPlugin::setCustomFilters(QList<IQuickOpenFilter *> filters)
+void LocatorPlugin::setCustomFilters(QList<ILocatorFilter *> filters)
 {
     m_customFilters = filters;
 }
 
-int QuickOpenPlugin::refreshInterval()
+int LocatorPlugin::refreshInterval()
 {
     return m_refreshTimer.interval() / 60000;
 }
 
-void QuickOpenPlugin::setRefreshInterval(int interval)
+void LocatorPlugin::setRefreshInterval(int interval)
 {
     if (interval < 1) {
         m_refreshTimer.stop();
@@ -238,16 +238,16 @@ void QuickOpenPlugin::setRefreshInterval(int interval)
     m_refreshTimer.start();
 }
 
-void QuickOpenPlugin::refresh(QList<IQuickOpenFilter*> filters)
+void LocatorPlugin::refresh(QList<ILocatorFilter*> filters)
 {
     if (filters.isEmpty())
         filters = m_filters;
-    QFuture<void> task = QtConcurrent::run(&IQuickOpenFilter::refresh, filters);
+    QFuture<void> task = QtConcurrent::run(&ILocatorFilter::refresh, filters);
     Core::FutureProgress *progress = Core::ICore::instance()
             ->progressManager()->addTask(task, tr("Indexing"),
-                                         QuickOpen::Constants::TASK_INDEX,
+                                         Locator::Constants::TASK_INDEX,
                                          Core::ProgressManager::CloseOnSuccess);
     connect(progress, SIGNAL(finished()), this, SLOT(saveSettings()));
 }
 
-Q_EXPORT_PLUGIN(QuickOpenPlugin)
+Q_EXPORT_PLUGIN(LocatorPlugin)
diff --git a/src/plugins/quickopen/quickopenplugin.h b/src/plugins/locator/locatorplugin.h
similarity index 75%
rename from src/plugins/quickopen/quickopenplugin.h
rename to src/plugins/locator/locatorplugin.h
index 44e227b748e3ff3152469c76c1ae01d7117fe2f6..525f291f4ad99826f4c99cf466f2b5ab5bdb617d 100644
--- a/src/plugins/quickopen/quickopenplugin.h
+++ b/src/plugins/locator/locatorplugin.h
@@ -27,10 +27,10 @@
 **
 **************************************************************************/
 
-#ifndef QUICKOPENPLUGIN_H
-#define QUICKOPENPLUGIN_H
+#ifndef LOCATORPLUGIN_H
+#define LOCATORPLUGIN_H
 
-#include "iquickopenfilter.h"
+#include "ilocatorfilter.h"
 #include "directoryfilter.h"
 
 #include <extensionsystem/iplugin.h>
@@ -39,37 +39,37 @@
 #include <QtCore/QTimer>
 #include <QtCore/QFutureWatcher>
 
-namespace QuickOpen {
+namespace Locator {
 namespace Internal {
 
-class QuickOpenToolWindow;
+class LocatorWidget;
 class OpenDocumentsFilter;
 class FileSystemFilter;
 class SettingsPage;
-class QuickOpenPlugin;
+class LocatorPlugin;
 
-class QuickOpenPlugin : public ExtensionSystem::IPlugin
+class LocatorPlugin : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
 
 public:
-    QuickOpenPlugin();
-    ~QuickOpenPlugin();
+    LocatorPlugin();
+    ~LocatorPlugin();
 
     bool initialize(const QStringList &arguments, QString *error_message);
     void extensionsInitialized();
 
-    QList<IQuickOpenFilter*> filters();
-    QList<IQuickOpenFilter*> customFilters();
-    void setFilters(QList<IQuickOpenFilter*> f);
-    void setCustomFilters(QList<IQuickOpenFilter*> f);
+    QList<ILocatorFilter*> filters();
+    QList<ILocatorFilter*> customFilters();
+    void setFilters(QList<ILocatorFilter*> f);
+    void setCustomFilters(QList<ILocatorFilter*> f);
     int refreshInterval();
     void setRefreshInterval(int interval);
 
 public slots:
-    void refresh(QList<IQuickOpenFilter*> filters = QList<IQuickOpenFilter*>());
+    void refresh(QList<ILocatorFilter*> filters = QList<ILocatorFilter*>());
     void saveSettings();
-    void openQuickOpen();
+    void openLocator();
 
 private slots:
     void startSettingsLoad();
@@ -81,11 +81,11 @@ private:
     template <typename S>
     void loadSettingsHelper(S *settings);
 
-    QuickOpenToolWindow *m_quickOpenToolWindow;
+    LocatorWidget *m_locatorWidget;
     SettingsPage *m_settingsPage;
 
-    QList<IQuickOpenFilter*> m_filters;
-    QList<IQuickOpenFilter*> m_customFilters;
+    QList<ILocatorFilter*> m_filters;
+    QList<ILocatorFilter*> m_customFilters;
     int m_refreshInterval;
     QTimer m_refreshTimer;
     OpenDocumentsFilter *m_openDocumentsFilter;
@@ -94,12 +94,12 @@ private:
 };
 
 template <typename S>
-void QuickOpenPlugin::loadSettingsHelper(S *settings)
+void LocatorPlugin::loadSettingsHelper(S *settings)
 {
     settings->beginGroup("QuickOpen");
     m_refreshTimer.setInterval(settings->value("RefreshInterval", 60).toInt() * 60000);
 
-    foreach (IQuickOpenFilter *filter, m_filters) {
+    foreach (ILocatorFilter *filter, m_filters) {
         if (settings->contains(filter->name())) {
             const QByteArray state = settings->value(filter->name()).toByteArray();
             if (!state.isEmpty())
@@ -107,10 +107,10 @@ void QuickOpenPlugin::loadSettingsHelper(S *settings)
         }
     }
     settings->beginGroup("CustomFilters");
-    QList<IQuickOpenFilter *> customFilters;
+    QList<ILocatorFilter *> customFilters;
     const QStringList keys = settings->childKeys();
     foreach (const QString &key, keys) {
-        IQuickOpenFilter *filter = new DirectoryFilter;
+        ILocatorFilter *filter = new DirectoryFilter;
         filter->restoreState(settings->value(key).toByteArray());
         m_filters.append(filter);
         customFilters.append(filter);
@@ -121,6 +121,6 @@ void QuickOpenPlugin::loadSettingsHelper(S *settings)
 }
 
 } // namespace Internal
-} // namespace QuickOpen
+} // namespace Locator
 
-#endif // QUICKOPENPLUGIN_H
+#endif // LOCATORPLUGIN_H
diff --git a/src/plugins/quickopen/quickopentoolwindow.cpp b/src/plugins/locator/locatorwidget.cpp
similarity index 81%
rename from src/plugins/quickopen/quickopentoolwindow.cpp
rename to src/plugins/locator/locatorwidget.cpp
index d5ca7ec735c916c3858fba903cb043a74d76e239..da15cd11004996983e0a6e9057a9bc422a2e9397 100644
--- a/src/plugins/quickopen/quickopentoolwindow.cpp
+++ b/src/plugins/locator/locatorwidget.cpp
@@ -29,17 +29,17 @@
 
 #include <qglobal.h>
 
-namespace QuickOpen {
+namespace Locator {
 struct FilterEntry;
 }
 
 QT_BEGIN_NAMESPACE
-unsigned int qHash(const QuickOpen::FilterEntry &entry);
+unsigned int qHash(const Locator::FilterEntry &entry);
 QT_END_NAMESPACE
 
-#include "quickopentoolwindow.h"
-#include "quickopenplugin.h"
-#include "quickopenconstants.h"
+#include "locatorwidget.h"
+#include "locatorplugin.h"
+#include "locatorconstants.h"
 
 #include <extensionsystem/pluginmanager.h>
 #include <coreplugin/icore.h>
@@ -67,17 +67,17 @@ QT_END_NAMESPACE
 #include <QtGui/QScrollBar>
 #include <QtGui/QTreeView>
 
-Q_DECLARE_METATYPE(QuickOpen::IQuickOpenFilter*);
-Q_DECLARE_METATYPE(QuickOpen::FilterEntry);
+Q_DECLARE_METATYPE(Locator::ILocatorFilter*);
+Q_DECLARE_METATYPE(Locator::FilterEntry);
 
-namespace QuickOpen {
+namespace Locator {
 namespace Internal {
 
-/*! A model to represent the QuickOpen results. */
-class QuickOpenModel : public QAbstractListModel
+/*! A model to represent the Locator results. */
+class LocatorModel : public QAbstractListModel
 {
 public:
-    QuickOpenModel(QObject *parent = 0)
+    LocatorModel(QObject *parent = 0)
         : QAbstractListModel(parent)
 //        , mDisplayCount(64)
     {}
@@ -107,10 +107,10 @@ private:
 };
 
 } // namespace Internal
-} // namespace QuickOpen
+} // namespace Locator
 
-using namespace QuickOpen;
-using namespace QuickOpen::Internal;
+using namespace Locator;
+using namespace Locator::Internal;
 
 QT_BEGIN_NAMESPACE
 uint qHash(const FilterEntry &entry)
@@ -122,25 +122,25 @@ uint qHash(const FilterEntry &entry)
 QT_END_NAMESPACE
 
 
-// =========== QuickOpenModel ===========
+// =========== LocatorModel ===========
 
-int QuickOpenModel::rowCount(const QModelIndex & /* parent */) const
+int LocatorModel::rowCount(const QModelIndex & /* parent */) const
 {
     return mEntries.size();
 }
 
-int QuickOpenModel::columnCount(const QModelIndex &parent) const
+int LocatorModel::columnCount(const QModelIndex &parent) const
 {
     return parent.isValid() ? 0 : 2;
 }
 
 /*!
- * When asked for the icon via Qt::DecorationRole, the QuickOpenModel lazily
+ * When asked for the icon via Qt::DecorationRole, the LocatorModel lazily
  * resolves and caches the Greehouse-specific file icon when
  * FilterEntry::resolveFileIcon is true. FilterEntry::internalData is assumed
  * to be the filename.
  */
-QVariant QuickOpenModel::data(const QModelIndex &index, int role) const
+QVariant LocatorModel::data(const QModelIndex &index, int role) const
 {
     if (!index.isValid() || index.row() >= mEntries.size())
         return QVariant();
@@ -168,13 +168,13 @@ QVariant QuickOpenModel::data(const QModelIndex &index, int role) const
     return QVariant();
 }
 
-void QuickOpenModel::setEntries(const QList<FilterEntry> &entries)
+void LocatorModel::setEntries(const QList<FilterEntry> &entries)
 {
     mEntries = entries;
     reset();
 }
 #if 0
-void QuickOpenModel::setDisplayCount(int count)
+void LocatorModel::setDisplayCount(int count)
 {
     // TODO: This method is meant to be used for increasing the number of items displayed at the
     // user's request. There is however no way yet for the user to request this.
@@ -244,11 +244,11 @@ void CompletionList::updatePreferredSize()
 }
 
 
-// =========== QuickOpenToolWindow ===========
+// =========== LocatorWidget ===========
 
-QuickOpenToolWindow::QuickOpenToolWindow(QuickOpenPlugin *qop) :
-     m_quickOpenPlugin(qop),
-     m_quickOpenModel(new QuickOpenModel(this)),
+LocatorWidget::LocatorWidget(LocatorPlugin *qop) :
+     m_locatorPlugin(qop),
+     m_locatorModel(new LocatorModel(this)),
      m_completionList(new CompletionList(this)),
      m_filterMenu(new QMenu(this)),
      m_refreshAction(new QAction(tr("Refresh"), this)),
@@ -272,7 +272,7 @@ QuickOpenToolWindow::QuickOpenToolWindow(QuickOpenPlugin *qop) :
     layout->setMargin(0);
     layout->addWidget(m_fileLineEdit);
 
-    setWindowIcon(QIcon(":/quickopen/images/quickopen.png"));
+    setWindowIcon(QIcon(":/locator/images/locator.png"));
     QPixmap image(Core::Constants::ICON_MAGNIFIER);
     m_fileLineEdit->setPixmap(image);
     m_fileLineEdit->setUseLayoutDirection(true);
@@ -283,7 +283,7 @@ QuickOpenToolWindow::QuickOpenToolWindow(QuickOpenPlugin *qop) :
     m_fileLineEdit->installEventFilter(this);
     this->installEventFilter(this);
 
-    m_completionList->setModel(m_quickOpenModel);
+    m_completionList->setModel(m_locatorModel);
     m_completionList->header()->resizeSection(0, 300);
     m_completionList->updatePreferredSize();
     m_completionList->resize(m_completionList->preferredSize());
@@ -293,7 +293,7 @@ QuickOpenToolWindow::QuickOpenToolWindow(QuickOpenPlugin *qop) :
 
     m_fileLineEdit->setMenu( m_filterMenu);
 
-    connect(m_refreshAction, SIGNAL(triggered()), m_quickOpenPlugin, SLOT(refresh()));
+    connect(m_refreshAction, SIGNAL(triggered()), m_locatorPlugin, SLOT(refresh()));
     connect(m_configureAction, SIGNAL(triggered()), this, SLOT(showConfigureDialog()));
     connect(m_fileLineEdit, SIGNAL(textEdited(const QString&)),
         this, SLOT(showPopup()));
@@ -301,15 +301,15 @@ QuickOpenToolWindow::QuickOpenToolWindow(QuickOpenPlugin *qop) :
             this, SLOT(acceptCurrentEntry()));
 }
 
-bool QuickOpenToolWindow::isShowingTypeHereMessage() const
+bool LocatorWidget::isShowingTypeHereMessage() const
 {
     return m_fileLineEdit->isShowingHintText();
 }
 
-void QuickOpenToolWindow::updateFilterList()
+void LocatorWidget::updateFilterList()
 {
     m_filterMenu->clear();
-    foreach (IQuickOpenFilter *filter, m_quickOpenPlugin->filters()) {
+    foreach (ILocatorFilter *filter, m_locatorPlugin->filters()) {
         if (!filter->shortcutString().isEmpty() && !filter->isHidden()) {
             QAction *action = m_filterMenu->addAction(filter->trName(), this, SLOT(filterSelected()));
             action->setData(qVariantFromValue(filter));
@@ -320,7 +320,7 @@ void QuickOpenToolWindow::updateFilterList()
     m_filterMenu->addAction(m_configureAction);
 }
 
-bool QuickOpenToolWindow::eventFilter(QObject *obj, QEvent *event)
+bool LocatorWidget::eventFilter(QObject *obj, QEvent *event)
 {
     if (obj == m_fileLineEdit && event->type() == QEvent::KeyPress) {
         QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
@@ -357,7 +357,7 @@ bool QuickOpenToolWindow::eventFilter(QObject *obj, QEvent *event)
     return QWidget::eventFilter(obj, event);
 }
 
-void QuickOpenToolWindow::showCompletionList()
+void LocatorWidget::showCompletionList()
 {
     const int border = m_completionList->frameWidth();
     const QSize size = m_completionList->preferredSize();
@@ -366,44 +366,44 @@ void QuickOpenToolWindow::showCompletionList()
     m_completionList->show();
 }
 
-void QuickOpenToolWindow::showPopup()
+void LocatorWidget::showPopup()
 {
     updateCompletionList(m_fileLineEdit->typedText());
     showCompletionList();
 }
 
-QList<IQuickOpenFilter*> QuickOpenToolWindow::filtersFor(const QString &text, QString &searchText)
+QList<ILocatorFilter*> LocatorWidget::filtersFor(const QString &text, QString &searchText)
 {
-    QList<IQuickOpenFilter*> filters = m_quickOpenPlugin->filters();
+    QList<ILocatorFilter*> filters = m_locatorPlugin->filters();
     int whiteSpace = text.indexOf(" ");
     QString prefix;
     if (whiteSpace >= 0)
         prefix = text.left(whiteSpace);
     if (!prefix.isEmpty()) {
         prefix = prefix.toLower();
-        foreach (IQuickOpenFilter *filter, filters) {
+        foreach (ILocatorFilter *filter, filters) {
             if (prefix == filter->shortcutString()) {
                 searchText = text.mid(whiteSpace+1);
-                return QList<IQuickOpenFilter*>() << filter;
+                return QList<ILocatorFilter*>() << filter;
             }
         }
     }
     searchText = text;
-    QList<IQuickOpenFilter*> activeFilters;
-    foreach (IQuickOpenFilter *filter, filters)
+    QList<ILocatorFilter*> activeFilters;
+    foreach (ILocatorFilter *filter, filters)
         if (filter->isIncludedByDefault())
             activeFilters << filter;
     return activeFilters;
 }
 
-void QuickOpenToolWindow::updateCompletionList(const QString &text)
+void LocatorWidget::updateCompletionList(const QString &text)
 {
     QString searchText;
-    const QList<IQuickOpenFilter*> filters = filtersFor(text, searchText);
+    const QList<ILocatorFilter*> filters = filtersFor(text, searchText);
     QSet<FilterEntry> alreadyAdded;
     const bool checkDuplicates = (filters.size() > 1);
     QList<FilterEntry> entries;
-    foreach (IQuickOpenFilter *filter, filters) {
+    foreach (ILocatorFilter *filter, filters) {
         foreach (const FilterEntry &entry, filter->matchesFor(searchText)) {
             if (checkDuplicates && alreadyAdded.contains(entry))
                 continue;
@@ -412,28 +412,28 @@ void QuickOpenToolWindow::updateCompletionList(const QString &text)
                 alreadyAdded.insert(entry);
         }
     }
-    m_quickOpenModel->setEntries(entries);
-    if (m_quickOpenModel->rowCount() > 0) {
-        m_completionList->setCurrentIndex(m_quickOpenModel->index(0, 0));
+    m_locatorModel->setEntries(entries);
+    if (m_locatorModel->rowCount() > 0) {
+        m_completionList->setCurrentIndex(m_locatorModel->index(0, 0));
     }
 #if 0
     m_completionList->updatePreferredSize();
 #endif
 }
 
-void QuickOpenToolWindow::acceptCurrentEntry()
+void LocatorWidget::acceptCurrentEntry()
 {
     if (!m_completionList->isVisible())
         return;
     const QModelIndex index = m_completionList->currentIndex();
     if (!index.isValid())
         return;
-    const FilterEntry entry = m_quickOpenModel->data(index, Qt::UserRole).value<FilterEntry>();
+    const FilterEntry entry = m_locatorModel->data(index, Qt::UserRole).value<FilterEntry>();
     m_completionList->hide();
     entry.filter->accept(entry);
 }
 
-void QuickOpenToolWindow::show(const QString &text, int selectionStart, int selectionLength)
+void LocatorWidget::show(const QString &text, int selectionStart, int selectionLength)
 {
     m_fileLineEdit->hideHintText();
     if (!text.isEmpty())
@@ -452,18 +452,18 @@ void QuickOpenToolWindow::show(const QString &text, int selectionStart, int sele
     }
 }
 
-void QuickOpenToolWindow::filterSelected()
+void LocatorWidget::filterSelected()
 {
     QString searchText = tr("<type here>");
     QAction *action = qobject_cast<QAction*>(sender());
     QTC_ASSERT(action, return);
-    IQuickOpenFilter *filter = action->data().value<IQuickOpenFilter*>();
+    ILocatorFilter *filter = action->data().value<ILocatorFilter*>();
     QTC_ASSERT(filter, return);
     QString currentText = m_fileLineEdit->text().trimmed();
     // add shortcut string at front or replace existing shortcut string
     if (!currentText.isEmpty()) {
         searchText = currentText;
-        foreach (IQuickOpenFilter *otherfilter, m_quickOpenPlugin->filters()) {
+        foreach (ILocatorFilter *otherfilter, m_locatorPlugin->filters()) {
             if (currentText.startsWith(otherfilter->shortcutString() + " ")) {
                 searchText = currentText.mid(otherfilter->shortcutString().length()+1);
                 break;
@@ -477,13 +477,13 @@ void QuickOpenToolWindow::filterSelected()
     m_fileLineEdit->setFocus();
 }
 
-void QuickOpenToolWindow::showEvent(QShowEvent *event)
+void LocatorWidget::showEvent(QShowEvent *event)
 {
     QWidget::showEvent(event);
 }
 
-void QuickOpenToolWindow::showConfigureDialog()
+void LocatorWidget::showConfigureDialog()
 {
-    Core::ICore::instance()->showOptionsDialog(Constants::QUICKOPEN_CATEGORY,
+    Core::ICore::instance()->showOptionsDialog(Constants::LOCATOR_CATEGORY,
           Constants::FILTER_OPTIONS_PAGE);
 }
diff --git a/src/plugins/quickopen/quickopentoolwindow.h b/src/plugins/locator/locatorwidget.h
similarity index 83%
rename from src/plugins/quickopen/quickopentoolwindow.h
rename to src/plugins/locator/locatorwidget.h
index 2509b175444c54166eb0a8897d2219233ca372df..4fefd4cb12f7148beca01eba71ac5535603fe4ae 100644
--- a/src/plugins/quickopen/quickopentoolwindow.h
+++ b/src/plugins/locator/locatorwidget.h
@@ -27,10 +27,10 @@
 **
 **************************************************************************/
 
-#ifndef QUICKOPENTOOLWINDOW_H
-#define QUICKOPENTOOLWINDOW_H
+#ifndef LOCATORWIDGET_H
+#define LOCATORWIDGET_H
 
-#include "quickopenplugin.h"
+#include "locatorplugin.h"
 
 #include <QtCore/QEvent>
 #include <QtGui/QWidget>
@@ -47,19 +47,19 @@ namespace Utils {
     class FancyLineEdit;
 }
 
-namespace QuickOpen {
+namespace Locator {
 namespace Internal {
 
-class QuickOpenModel;
+class LocatorModel;
 class CompletionList;
 
-class QuickOpenToolWindow
+class LocatorWidget
   : public QWidget
 {
     Q_OBJECT
 
 public:
-    QuickOpenToolWindow(QuickOpenPlugin *qop);
+    LocatorWidget(LocatorPlugin *qop);
 
     void updateFilterList();
 
@@ -79,10 +79,10 @@ private:
     bool isShowingTypeHereMessage() const;
     void showCompletionList();
     void updateCompletionList(const QString &text);
-    QList<IQuickOpenFilter*> filtersFor(const QString &text, QString &searchText);
+    QList<ILocatorFilter*> filtersFor(const QString &text, QString &searchText);
 
-    QuickOpenPlugin *m_quickOpenPlugin;
-    QuickOpenModel *m_quickOpenModel;
+    LocatorPlugin *m_locatorPlugin;
+    LocatorModel *m_locatorModel;
 
     CompletionList *m_completionList;
     QMenu *m_filterMenu;
@@ -92,6 +92,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace QuickOpen
+} // namespace Locator
 
-#endif // QUICKOPENTOOLWINDOW_H
+#endif // LOCATORWIDGET_H
diff --git a/src/plugins/quickopen/opendocumentsfilter.cpp b/src/plugins/locator/opendocumentsfilter.cpp
similarity index 98%
rename from src/plugins/quickopen/opendocumentsfilter.cpp
rename to src/plugins/locator/opendocumentsfilter.cpp
index 5f7b091e0c87ed604fc7db35d4e48354efffb915..a85da7fee9719492185cc7d604d8151a4aa18f92 100644
--- a/src/plugins/quickopen/opendocumentsfilter.cpp
+++ b/src/plugins/locator/opendocumentsfilter.cpp
@@ -32,8 +32,8 @@
 Q_DECLARE_METATYPE(Core::IEditor*);
 
 using namespace Core;
-using namespace QuickOpen;
-using namespace QuickOpen::Internal;
+using namespace Locator;
+using namespace Locator::Internal;
 
 OpenDocumentsFilter::OpenDocumentsFilter(EditorManager *editorManager) :
     m_editorManager(editorManager)
diff --git a/src/plugins/quickopen/opendocumentsfilter.h b/src/plugins/locator/opendocumentsfilter.h
similarity index 84%
rename from src/plugins/quickopen/opendocumentsfilter.h
rename to src/plugins/locator/opendocumentsfilter.h
index 074ab6eb1a83fdf3ce11a90f6d043eea7606b5eb..fc040971f7c7742227976c0361e12ef73c9d54a0 100644
--- a/src/plugins/quickopen/opendocumentsfilter.h
+++ b/src/plugins/locator/opendocumentsfilter.h
@@ -30,7 +30,7 @@
 #ifndef OPENDOCUMENTSFILTER_H
 #define OPENDOCUMENTSFILTER_H
 
-#include "iquickopenfilter.h"
+#include "ilocatorfilter.h"
 
 #include <QtCore/QString>
 #include <QtCore/QList>
@@ -41,10 +41,10 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 
-namespace QuickOpen {
+namespace Locator {
 namespace Internal {
 
-class OpenDocumentsFilter : public QuickOpen::IQuickOpenFilter
+class OpenDocumentsFilter : public Locator::ILocatorFilter
 {
     Q_OBJECT
 
@@ -52,9 +52,9 @@ public:
     OpenDocumentsFilter(Core::EditorManager *editorManager);
     QString trName() const { return tr("Open documents"); }
     QString name() const { return "Open documents"; }
-    QuickOpen::IQuickOpenFilter::Priority priority() const { return QuickOpen::IQuickOpenFilter::Medium; }
-    QList<QuickOpen::FilterEntry> matchesFor(const QString &entry);
-    void accept(QuickOpen::FilterEntry selection) const;
+    Locator::ILocatorFilter::Priority priority() const { return Locator::ILocatorFilter::Medium; }
+    QList<Locator::FilterEntry> matchesFor(const QString &entry);
+    void accept(Locator::FilterEntry selection) const;
     void refresh(QFutureInterface<void> &future);
 
 public slots:
@@ -67,6 +67,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace QuickOpen
+} // namespace Locator
 
 #endif // OPENDOCUMENTSFILTER_H
diff --git a/src/plugins/quickopen/settingspage.cpp b/src/plugins/locator/settingspage.cpp
similarity index 85%
rename from src/plugins/quickopen/settingspage.cpp
rename to src/plugins/locator/settingspage.cpp
index 8b6ff49dfaebf3b6a2064acddf903f75f023b9ed..99453132fe1926070eee486254c57f7a2885f83b 100644
--- a/src/plugins/quickopen/settingspage.cpp
+++ b/src/plugins/locator/settingspage.cpp
@@ -28,10 +28,10 @@
 **************************************************************************/
 
 #include "settingspage.h"
-#include "quickopenconstants.h"
+#include "locatorconstants.h"
 
-#include "quickopenplugin.h"
-#include "iquickopenfilter.h"
+#include "locatorplugin.h"
+#include "ilocatorfilter.h"
 #include "directoryfilter.h"
 
 #include <qtconcurrent/QtConcurrentTools>
@@ -39,12 +39,12 @@
 
 #include <QtCore/QCoreApplication>
 
-Q_DECLARE_METATYPE(QuickOpen::IQuickOpenFilter*)
+Q_DECLARE_METATYPE(Locator::ILocatorFilter*)
 
-using namespace QuickOpen;
-using namespace QuickOpen::Internal;
+using namespace Locator;
+using namespace Locator::Internal;
 
-SettingsPage::SettingsPage(QuickOpenPlugin *plugin)
+SettingsPage::SettingsPage(LocatorPlugin *plugin)
     : m_plugin(plugin), m_page(0)
 {
 }
@@ -56,17 +56,17 @@ QString SettingsPage::id() const
 
 QString SettingsPage::trName() const
 {
-    return QCoreApplication::translate("Locator", QuickOpen::Constants::FILTER_OPTIONS_PAGE);
+    return QCoreApplication::translate("Locator", Locator::Constants::FILTER_OPTIONS_PAGE);
 }
 
 QString SettingsPage::category() const
 {
-    return Constants::QUICKOPEN_CATEGORY;
+    return Constants::LOCATOR_CATEGORY;
 }
 
 QString SettingsPage::trCategory() const
 {
-    return QCoreApplication::translate("Locator", QuickOpen::Constants::QUICKOPEN_CATEGORY);
+    return QCoreApplication::translate("Locator", Locator::Constants::LOCATOR_CATEGORY);
 }
 
 QWidget *SettingsPage::createPage(QWidget *parent)
@@ -135,20 +135,20 @@ void SettingsPage::requestRefresh()
 void SettingsPage::saveFilterStates()
 {
     m_filterStates.clear();
-    foreach (IQuickOpenFilter *filter, m_filters)
+    foreach (ILocatorFilter *filter, m_filters)
         m_filterStates.insert(filter, filter->saveState());
 }
 
 void SettingsPage::restoreFilterStates()
 {
-    foreach (IQuickOpenFilter *filter, m_filterStates.keys())
+    foreach (ILocatorFilter *filter, m_filterStates.keys())
         filter->restoreState(m_filterStates.value(filter));
 }
 
 void SettingsPage::updateFilterList()
 {
     m_ui.filterList->clear();
-    foreach (IQuickOpenFilter *filter, m_filters) {
+    foreach (ILocatorFilter *filter, m_filters) {
         if (filter->isHidden())
             continue;
 
@@ -168,7 +168,7 @@ void SettingsPage::updateFilterList()
 void SettingsPage::updateButtonStates()
 {
     QListWidgetItem *item = m_ui.filterList->currentItem();
-    IQuickOpenFilter *filter = (item ? item->data(Qt::UserRole).value<IQuickOpenFilter *>() : 0);
+    ILocatorFilter *filter = (item ? item->data(Qt::UserRole).value<ILocatorFilter *>() : 0);
     m_ui.editButton->setEnabled(filter && filter->isConfigurable());
     m_ui.removeButton->setEnabled(filter && m_customFilters.contains(filter));
 }
@@ -178,7 +178,7 @@ void SettingsPage::configureFilter(QListWidgetItem *item)
     if (!item)
         item = m_ui.filterList->currentItem();
     QTC_ASSERT(item, return);
-    IQuickOpenFilter *filter = item->data(Qt::UserRole).value<IQuickOpenFilter *>();
+    ILocatorFilter *filter = item->data(Qt::UserRole).value<ILocatorFilter *>();
     QTC_ASSERT(filter, return);
 
     if (!filter->isConfigurable())
@@ -192,7 +192,7 @@ void SettingsPage::configureFilter(QListWidgetItem *item)
 
 void SettingsPage::addCustomFilter()
 {
-    IQuickOpenFilter *filter = new DirectoryFilter;
+    ILocatorFilter *filter = new DirectoryFilter;
     bool needsRefresh = false;
     if (filter->openConfigDialog(m_page, needsRefresh)) {
         m_filters.append(filter);
@@ -207,7 +207,7 @@ void SettingsPage::removeCustomFilter()
 {
     QListWidgetItem *item = m_ui.filterList->currentItem();
     QTC_ASSERT(item, return);
-    IQuickOpenFilter *filter = item->data(Qt::UserRole).value<IQuickOpenFilter *>();
+    ILocatorFilter *filter = item->data(Qt::UserRole).value<ILocatorFilter *>();
     QTC_ASSERT(m_customFilters.contains(filter), return);
     m_filters.removeAll(filter);
     m_customFilters.removeAll(filter);
diff --git a/src/plugins/quickopen/settingspage.h b/src/plugins/locator/settingspage.h
similarity index 82%
rename from src/plugins/quickopen/settingspage.h
rename to src/plugins/locator/settingspage.h
index c4b008d220c716f5ad0bf9ab7bc5bef67f799f80..1fb55661e0fcf6afdfc042828ef40cf116287d74 100644
--- a/src/plugins/quickopen/settingspage.h
+++ b/src/plugins/locator/settingspage.h
@@ -41,20 +41,20 @@ QT_BEGIN_NAMESPACE
 class QListWidgetItem;
 QT_END_NAMESPACE
 
-namespace QuickOpen {
+namespace Locator {
 
-class IQuickOpenFilter;
+class ILocatorFilter;
 
 namespace Internal {
 
-class QuickOpenPlugin;
+class LocatorPlugin;
 
 class SettingsPage : public Core::IOptionsPage
 {
     Q_OBJECT
 
 public:
-    explicit SettingsPage(QuickOpenPlugin *plugin);
+    explicit SettingsPage(LocatorPlugin *plugin);
     QString id() const;
     QString trName() const;
     QString category() const;
@@ -77,17 +77,17 @@ private:
     void requestRefresh();
 
     Ui::SettingsWidget m_ui;
-    QuickOpenPlugin *m_plugin;
+    LocatorPlugin *m_plugin;
     QWidget* m_page;
-    QList<IQuickOpenFilter *> m_filters;
-    QList<IQuickOpenFilter *> m_addedFilters;
-    QList<IQuickOpenFilter *> m_removedFilters;
-    QList<IQuickOpenFilter *> m_customFilters;
-    QList<IQuickOpenFilter *> m_refreshFilters;
-    QHash<IQuickOpenFilter *, QByteArray> m_filterStates;
+    QList<ILocatorFilter *> m_filters;
+    QList<ILocatorFilter *> m_addedFilters;
+    QList<ILocatorFilter *> m_removedFilters;
+    QList<ILocatorFilter *> m_customFilters;
+    QList<ILocatorFilter *> m_refreshFilters;
+    QHash<ILocatorFilter *, QByteArray> m_filterStates;
 };
 
 } // namespace Internal
-} // namespace QuickOpen
+} // namespace Locator
 
 #endif // SETTINGSPAGE_H
diff --git a/src/plugins/quickopen/settingspage.ui b/src/plugins/locator/settingspage.ui
similarity index 96%
rename from src/plugins/quickopen/settingspage.ui
rename to src/plugins/locator/settingspage.ui
index 06d3116f08ac7e2f8111a662258aacdccd56629b..f2f055c57b68b7e90ef2b745829b0932177bb7ad 100644
--- a/src/plugins/quickopen/settingspage.ui
+++ b/src/plugins/locator/settingspage.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>QuickOpen::Internal::SettingsWidget</class>
- <widget class="QWidget" name="QuickOpen::Internal::SettingsWidget">
+ <class>Locator::Internal::SettingsWidget</class>
+ <widget class="QWidget" name="Locator::Internal::SettingsWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -91,9 +91,6 @@
        <property name="buttonSymbols">
         <enum>QAbstractSpinBox::PlusMinus</enum>
        </property>
-       <property name="value">
-        <number>60</number>
-       </property>
        <property name="suffix">
         <string> min</string>
        </property>
@@ -103,6 +100,9 @@
        <property name="singleStep">
         <number>5</number>
        </property>
+       <property name="value">
+        <number>60</number>
+       </property>
       </widget>
      </item>
      <item>
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/ProjectExplorer.pluginspec b/src/plugins/projectexplorer/ProjectExplorer.pluginspec
index 145fec73c1a23117e63a4664aa0fece883ab3ba4..59b1cef96f9edefa57a2b08b52d7c39b4907bce7 100644
--- a/src/plugins/projectexplorer/ProjectExplorer.pluginspec
+++ b/src/plugins/projectexplorer/ProjectExplorer.pluginspec
@@ -21,7 +21,7 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <dependencyList>
         <dependency name="Core" version="1.2.93"/>
         <dependency name="Find" version="1.2.93"/>
-        <dependency name="QuickOpen" version="1.2.93"/>
+        <dependency name="Locator" version="1.2.93"/>
         <dependency name="TextEditor" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/projectexplorer/allprojectsfilter.cpp b/src/plugins/projectexplorer/allprojectsfilter.cpp
index b9ff232579380d98827b0297f47e0831828c9a31..bd7d120d428c6f110235b42b5bbb7507d31442df 100644
--- a/src/plugins/projectexplorer/allprojectsfilter.cpp
+++ b/src/plugins/projectexplorer/allprojectsfilter.cpp
@@ -35,7 +35,7 @@
 #include <QtCore/QVariant>
 
 using namespace Core;
-using namespace QuickOpen;
+using namespace Locator;
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
 
diff --git a/src/plugins/projectexplorer/allprojectsfilter.h b/src/plugins/projectexplorer/allprojectsfilter.h
index 9883df0479d7538d6e522e3b33bd3d7c34fc9a80..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>
@@ -42,7 +42,7 @@ class ProjectExplorerPlugin;
 
 namespace Internal {
 
-class AllProjectsFilter : public QuickOpen::BaseFileFilter
+class AllProjectsFilter : public Locator::BaseFileFilter
 {
     Q_OBJECT
 
@@ -50,7 +50,7 @@ public:
     explicit AllProjectsFilter(ProjectExplorerPlugin *pe);
     QString trName() const { return tr("Files in any project"); }
     QString name() const { return "Files in any project"; }
-    QuickOpen::IQuickOpenFilter::Priority priority() const { return QuickOpen::IQuickOpenFilter::Low; }
+    Locator::ILocatorFilter::Priority priority() const { return Locator::ILocatorFilter::Low; }
     void refresh(QFutureInterface<void> &future);
 
 protected:
diff --git a/src/plugins/projectexplorer/currentprojectfilter.cpp b/src/plugins/projectexplorer/currentprojectfilter.cpp
index 71a6a5c2ab96b42b75a10606e1ef2fd69a4fc454..c43eba56e02b7b3166aabf53680dfd28d1ba9949 100644
--- a/src/plugins/projectexplorer/currentprojectfilter.cpp
+++ b/src/plugins/projectexplorer/currentprojectfilter.cpp
@@ -38,7 +38,7 @@
 #include <QtCore/QVariant>
 
 using namespace Core;
-using namespace QuickOpen;
+using namespace Locator;
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
 
diff --git a/src/plugins/projectexplorer/currentprojectfilter.h b/src/plugins/projectexplorer/currentprojectfilter.h
index 90dd88da4c0a5be476af314f048adfa2d6396104..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>
@@ -45,7 +45,7 @@ class Project;
 
 namespace Internal {
 
-class CurrentProjectFilter : public QuickOpen::BaseFileFilter
+class CurrentProjectFilter : public Locator::BaseFileFilter
 {
     Q_OBJECT
 
@@ -53,7 +53,7 @@ public:
     CurrentProjectFilter(ProjectExplorerPlugin *pe);
     QString trName() const { return tr("Files in current project"); }
     QString name() const { return "Files in current project"; }
-    QuickOpen::IQuickOpenFilter::Priority priority() const { return QuickOpen::IQuickOpenFilter::Low; }
+    Locator::ILocatorFilter::Priority priority() const { return Locator::ILocatorFilter::Low; }
     void refresh(QFutureInterface<void> &future);
 
 protected:
diff --git a/src/plugins/projectexplorer/projectexplorer_dependencies.pri b/src/plugins/projectexplorer/projectexplorer_dependencies.pri
index 674c8bbb362f8727a5284f915e046a8db44f538a..b4dec5148a09f3eb803660f2e88f439794ffcd37 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/locator.pri)
 include(../../plugins/find/find.pri)
 include(../../plugins/coreplugin/coreplugin.pri)
 include(../../plugins/texteditor/texteditor.pri)
diff --git a/src/plugins/quickopen/directoryparser.cpp b/src/plugins/quickopen/directoryparser.cpp
deleted file mode 100644
index 6bd8f431d50675a0f265f1575078b426102de534..0000000000000000000000000000000000000000
--- a/src/plugins/quickopen/directoryparser.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-**
-**************************************************************************/
-
-#include "directoryparser.h"
-#include "quickopenplugin.h"
-
-using namespace QuickOpen::Internal;
-
-DirectoryParser::DirectoryParser(QObject *parent)
-	: QThread(parent)
-{
-}
-
-DirectoryParser::~DirectoryParser()
-{
-    if (isRunning())
-        terminate();
-}
-
-void DirectoryParser::parse(Filter filter)
-{
-    m_dirs = filter.directories();
-    m_filters = filter.acceptedFileExtensions().split(';');
-    m_blackList.clear();
-    foreach (QString s, filter.skipDirectories()) {
-        if (!s.trimmed().isEmpty() && !m_blackList.contains(s))
-            m_blackList.insert(s);
-    }
-    if (!isRunning())
-        start(QThread::NormalPriority);
-}
-
-void DirectoryParser::setDirectoryNameBlackList(const QStringList &lst)
-{
-    m_blackList.clear();
-    foreach (QString s, lst) {
-        if (!m_blackList.contains(s))
-            m_blackList.insert(s);
-    }
-}
-
-QSet<QString> DirectoryParser::files() const
-{
-    return m_files;
-}
-
-void DirectoryParser::run()
-{
-    m_files.clear();
-    m_runFiles.clear();
-    foreach (QString s, m_dirs) {
-        if (s.isEmpty())
-            continue;
-        QDir dir(s);
-        if (dir.exists()) {
-            m_runFilters = m_filters;
-            m_runBlackList = m_blackList;
-            collectFiles(dir);
-        }
-    }
-    m_files = m_runFiles;
-    emit directoriesParsed();
-}
-
-void DirectoryParser::collectFiles(const QDir &dir)
-{
-    QString dirName = dir.absolutePath() + QLatin1String("/");
-    foreach (QString f, dir.entryList(m_runFilters, QDir::Files)) {
-        m_runFiles.insert(dirName + f);
-    }
-    foreach (QString d, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
-        if (!m_runBlackList.contains(d))
-            collectFiles(dir.absolutePath() + QDir::separator() + d);
-    }
-}
diff --git a/src/plugins/quickopen/directoryparser.h b/src/plugins/quickopen/directoryparser.h
deleted file mode 100644
index 35618f33e391b68798f38051fdd6f7a86186f314..0000000000000000000000000000000000000000
--- a/src/plugins/quickopen/directoryparser.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-**
-**************************************************************************/
-
-#ifndef DIRECTORYPARSER_H
-#define DIRECTORYPARSER_H
-
-#include <QtCore/QThread>
-#include <QtCore/QDir>
-#include <QtCore/QSet>
-
-namespace QuickOpen {
-namespace Internal {
-
-class Filter;
-
-class DirectoryParser : public QThread
-{
-	Q_OBJECT
-
-public:
-    DirectoryParser(QObject *parent);
-    ~DirectoryParser();
-    void parse(Filter filter);
-
-    void setDirectoryNameBlackList(const QStringList &lst);
-    QSet<QString> files() const;
-
-signals:
-    void directoriesParsed();
-
-private:
-    void run();
-    void collectFiles(const QDir &dir);
-
-    QStringList m_dirs;
-    QSet<QString> m_files;
-
-    QSet<QString> m_runFiles;
-    QStringList m_filters;
-    QStringList m_runFilters;
-    QSet<QString> m_blackList;
-    QSet<QString> m_runBlackList;
-};
-
-} // namespace Internal
-} // namespace QuickOpen
-
-#endif // DIRECTORYPARSER_H
diff --git a/src/plugins/quickopen/quickopen.cp b/src/plugins/quickopen/quickopen.cp
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/plugins/quickopen/quickopen.pri b/src/plugins/quickopen/quickopen.pri
deleted file mode 100644
index a5645e529ea0486d2971bed0c42956d9277d1bd9..0000000000000000000000000000000000000000
--- a/src/plugins/quickopen/quickopen.pri
+++ /dev/null
@@ -1,3 +0,0 @@
-include(quickopen_dependencies.pri)
-
-LIBS *= -l$$qtLibraryTarget(QuickOpen)
diff --git a/src/plugins/quickopen/quickopen.pro b/src/plugins/quickopen/quickopen.pro
deleted file mode 100644
index 83b4cd58dd260638863bdfb0d4e9f4f1bd41a1b5..0000000000000000000000000000000000000000
--- a/src/plugins/quickopen/quickopen.pro
+++ /dev/null
@@ -1,33 +0,0 @@
-TEMPLATE = lib
-TARGET = QuickOpen
-DEFINES += QUICKOPEN_LIBRARY
-include(../../qtcreatorplugin.pri)
-include(quickopen_dependencies.pri)
-HEADERS += quickopenplugin.h \
-    quickopentoolwindow.h \
-    quickopenfiltersfilter.h \
-    settingspage.h \
-    iquickopenfilter.h \
-    opendocumentsfilter.h \
-    filesystemfilter.h \
-    quickopenconstants.h \
-    directoryfilter.h \
-    quickopenmanager.h \
-    basefilefilter.h \
-    quickopen_global.h
-SOURCES += quickopenplugin.cpp \
-    quickopentoolwindow.cpp \
-    quickopenfiltersfilter.cpp \
-    opendocumentsfilter.cpp \
-    filesystemfilter.cpp \
-    settingspage.cpp \
-    directoryfilter.cpp \
-    quickopenmanager.cpp \
-    basefilefilter.cpp \
-    iquickopenfilter.cpp
-FORMS += settingspage.ui \
-    filesystemfilter.ui \
-    directoryfilter.ui
-RESOURCES += quickopen.qrc
-
-OTHER_FILES += QuickOpen.pluginspec
diff --git a/src/plugins/quickopen/quickopen.qrc b/src/plugins/quickopen/quickopen.qrc
deleted file mode 100644
index 0ab0ff14fc231fb513e3daaa9a485d382832628f..0000000000000000000000000000000000000000
--- a/src/plugins/quickopen/quickopen.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<RCC>
-    <qresource prefix="/quickopen" >
-        <file>images/quickopen.png</file>
-        <file>images/reload.png</file>
-    </qresource>
-</RCC>
diff --git a/src/plugins/quickopen/settingswidget.ui b/src/plugins/quickopen/settingswidget.ui
deleted file mode 100644
index 03653fe6a0ae1cfa2123be8b828600ea62ce534b..0000000000000000000000000000000000000000
--- a/src/plugins/quickopen/settingswidget.ui
+++ /dev/null
@@ -1,133 +0,0 @@
-<ui version="4.0" >
- <class>QuickOpen::Internal::SettingsDialog</class>
- <widget class="QWidget" name="QuickOpen::Internal::SettingsDialog" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>460</width>
-    <height>353</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Configure Filters</string>
-  </property>
-  <layout class="QGridLayout" >
-   <item row="0" column="0" >
-    <widget class="QListWidget" name="filterList" >
-     <property name="font" >
-      <font/>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" >
-    <layout class="QVBoxLayout" >
-     <item>
-      <widget class="QPushButton" name="addButton" >
-       <property name="enabled" >
-        <bool>false</bool>
-       </property>
-       <property name="text" >
-        <string>Add</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="removeButton" >
-       <property name="enabled" >
-        <bool>false</bool>
-       </property>
-       <property name="text" >
-        <string>Remove</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="editButton" >
-       <property name="enabled" >
-        <bool>false</bool>
-       </property>
-       <property name="text" >
-        <string>Edit...</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item row="1" column="0" colspan="2" >
-    <layout class="QHBoxLayout" >
-     <item>
-      <widget class="QLabel" name="label" >
-       <property name="text" >
-        <string>Refresh Interval:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSpinBox" name="refreshInterval" >
-       <property name="frame" >
-        <bool>true</bool>
-       </property>
-       <property name="buttonSymbols" >
-        <enum>QAbstractSpinBox::PlusMinus</enum>
-       </property>
-       <property name="suffix" >
-        <string> min</string>
-       </property>
-       <property name="maximum" >
-        <number>320</number>
-       </property>
-       <property name="singleStep" >
-        <number>5</number>
-       </property>
-       <property name="value" >
-        <number>60</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="refreshButton" >
-       <property name="font" >
-        <font/>
-       </property>
-       <property name="text" >
-        <string>Refresh now!</string>
-       </property>
-       <property name="toolButtonStyle" >
-        <enum>Qt::ToolButtonTextBesideIcon</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/plugins/texteditor/TextEditor.pluginspec b/src/plugins/texteditor/TextEditor.pluginspec
index 22e1a928efd3f3758dde6e90430ea94a9cadc383..db1e389e52f977ee0470f00ed4583033d6db1d5d 100644
--- a/src/plugins/texteditor/TextEditor.pluginspec
+++ b/src/plugins/texteditor/TextEditor.pluginspec
@@ -21,6 +21,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <dependencyList>
         <dependency name="Core" version="1.2.93"/>
         <dependency name="Find" version="1.2.93"/>
-        <dependency name="QuickOpen" version="1.2.93"/>
+        <dependency name="Locator" version="1.2.93"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/texteditor/linenumberfilter.cpp b/src/plugins/texteditor/linenumberfilter.cpp
index 8b63394fea576e56f001a36db2dcdde483b2a3b9..e4eccecdf42ad23ae39c89dcfafb30c3b5ae4ae6 100644
--- a/src/plugins/texteditor/linenumberfilter.cpp
+++ b/src/plugins/texteditor/linenumberfilter.cpp
@@ -35,12 +35,12 @@
 #include <QtCore/QVariant>
 
 using namespace Core;
-using namespace QuickOpen;
+using namespace Locator;
 using namespace TextEditor;
 using namespace TextEditor::Internal;
 
 LineNumberFilter::LineNumberFilter(QObject *parent)
-  : IQuickOpenFilter(parent)
+  : ILocatorFilter(parent)
 {
     setShortcutString("l");
     setIncludedByDefault(true);
diff --git a/src/plugins/texteditor/linenumberfilter.h b/src/plugins/texteditor/linenumberfilter.h
index c10e382b6c90acd3c6fd250ba56e65f9a1f50870..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/iquickopenfilter.h>
+#include <locator/ilocatorfilter.h>
 
 #include <QtCore/QString>
 #include <QtCore/QList>
@@ -42,7 +42,7 @@ class ITextEditor;
 
 namespace Internal {
 
-class LineNumberFilter : public QuickOpen::IQuickOpenFilter
+class LineNumberFilter : public Locator::ILocatorFilter
 {
     Q_OBJECT
 
@@ -51,9 +51,9 @@ public:
 
     QString trName() const { return tr("Line in current document"); }
     QString name() const { return "Line in current document"; }
-    QuickOpen::IQuickOpenFilter::Priority priority() const { return QuickOpen::IQuickOpenFilter::High; }
-    QList<QuickOpen::FilterEntry> matchesFor(const QString &entry);
-    void accept(QuickOpen::FilterEntry selection) const;
+    Locator::ILocatorFilter::Priority priority() const { return Locator::ILocatorFilter::High; }
+    QList<Locator::FilterEntry> matchesFor(const QString &entry);
+    void accept(Locator::FilterEntry selection) const;
     void refresh(QFutureInterface<void> &) {}
 
 private:
diff --git a/src/plugins/texteditor/texteditor_dependencies.pri b/src/plugins/texteditor/texteditor_dependencies.pri
index 87f23e9eedea6862618f6af9afb6bfb2ee352005..5012cea9ffeced7e39f799e0e3e707bd5ea8acdb 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/locator.pri)
 include(../../plugins/coreplugin/coreplugin.pri)
diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp
index 018a8f44f77fde403a7d6fb94652fe46f151f46d..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/quickopenmanager.h>
+#include <locator/locatormanager.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/uniqueidmanager.h>
@@ -360,11 +360,11 @@ void TextEditorActionHandler::updateCopyAction()
 
 void TextEditorActionHandler::gotoAction()
 {
-    QuickOpen::QuickOpenManager *quickopen = QuickOpen::QuickOpenManager::instance();
-    QTC_ASSERT(quickopen, return);
+    Locator::LocatorManager *locatorManager = Locator::LocatorManager::instance();
+    QTC_ASSERT(locatorManager, return);
     const QString shortcut = TextEditorPlugin::instance()->lineNumberFilter()->shortcutString();
     const QString text = tr(" <line number>");
-    quickopen->show(shortcut + text, 2, text.length()-1);
+    locatorManager->show(shortcut + text, 2, text.length()-1);
 }
 
 void TextEditorActionHandler::printAction()