diff --git a/src/plugins/quickopen/images/quickopen.png b/src/plugins/quickopen/images/locator.png
similarity index 100%
rename from src/plugins/quickopen/images/quickopen.png
rename to src/plugins/quickopen/images/locator.png
diff --git a/src/plugins/quickopen/locator.qrc b/src/plugins/quickopen/locator.qrc
new file mode 100644
index 00000000000..4cd5df4f13d
--- /dev/null
+++ b/src/plugins/quickopen/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/locatorwidget.cpp b/src/plugins/quickopen/locatorwidget.cpp
index 61679cb0616..88106647037 100644
--- a/src/plugins/quickopen/locatorwidget.cpp
+++ b/src/plugins/quickopen/locatorwidget.cpp
@@ -272,7 +272,7 @@ LocatorWidget::LocatorWidget(LocatorPlugin *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);
diff --git a/src/plugins/quickopen/quickopen.pro b/src/plugins/quickopen/quickopen.pro
index 0cf3907ce76..5b56c4edf09 100644
--- a/src/plugins/quickopen/quickopen.pro
+++ b/src/plugins/quickopen/quickopen.pro
@@ -28,6 +28,6 @@ SOURCES += locatorplugin.cpp \
 FORMS += settingspage.ui \
     filesystemfilter.ui \
     directoryfilter.ui
-RESOURCES += quickopen.qrc
+RESOURCES += locator.qrc
 
 OTHER_FILES += QuickOpen.pluginspec
diff --git a/src/plugins/quickopen/quickopen.qrc b/src/plugins/quickopen/quickopen.qrc
deleted file mode 100644
index 0ab0ff14fc2..00000000000
--- 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/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp
index 11050285ff6..727d08d4d6c 100644
--- a/src/plugins/texteditor/texteditoractionhandler.cpp
+++ b/src/plugins/texteditor/texteditoractionhandler.cpp
@@ -360,11 +360,11 @@ void TextEditorActionHandler::updateCopyAction()
 
 void TextEditorActionHandler::gotoAction()
 {
-    QuickOpen::LocatorManager *quickopen = QuickOpen::LocatorManager::instance();
-    QTC_ASSERT(quickopen, return);
+    QuickOpen::LocatorManager *locatorManager = QuickOpen::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()