diff --git a/applets/kicker/plugin/computermodel.cpp b/applets/kicker/plugin/computermodel.cpp
--- a/applets/kicker/plugin/computermodel.cpp
+++ b/applets/kicker/plugin/computermodel.cpp
@@ -101,11 +101,11 @@
     }
 
     if (role == Qt::DisplayRole) {
-        return i18n("Run Command...");
+        return i18n("Show KRunner");
     } else if (role == Qt::DecorationRole) {
-        return QIcon::fromTheme(QStringLiteral("system-run"));
+        return QIcon::fromTheme(QStringLiteral("plasma-search"));
     } else if (role == Kicker::DescriptionRole) {
-        return i18n("Run a command or a search query");
+        return i18n("Search, calculate, or run a command");
     } else if (role == Kicker::GroupRole) {
         return i18n("Applications");
     }
diff --git a/design/containmentactions b/design/containmentactions
--- a/design/containmentactions
+++ b/design/containmentactions
@@ -63,7 +63,7 @@
 The Containment class supports loading and using containmentactions plugins.
 Subclasses need do nothing to get this support. If a subclass has extra actions it wants in the
 contextmenu, it can provide them in contextualActions() the same as before - but there's no longer
-any need to return standard actions like "add widgets" and "run command".
+any need to return standard actions like "add widgets" and "show krunner".
 
 ContextActions plugins to use are set using the setContainmentActions(const QString &trigger, const QString &pluginName)
 method. an empty string removes any plugin set for the given trigger.
diff --git a/doc/plasma-desktop/index.docbook b/doc/plasma-desktop/index.docbook
--- a/doc/plasma-desktop/index.docbook
+++ b/doc/plasma-desktop/index.docbook
@@ -548,7 +548,7 @@
 </screenshot>
 
 <para>Use the <inlinemediaobject><imageobject><imagedata fileref="krunner-configure.png" format="PNG"/>
-</imageobject></inlinemediaobject> button to open the <guilabel>Plasma Search</guilabel> &systemsettings; 
+</imageobject></inlinemediaobject> button to open the <guilabel>KRunner</guilabel> &systemsettings;
 module and configure where and what to search for in &krunner;
 </para>
 
diff --git a/kcms/runners/kcm.cpp b/kcms/runners/kcm.cpp
--- a/kcms/runners/kcm.cpp
+++ b/kcms/runners/kcm.cpp
@@ -56,7 +56,7 @@
 
     QHBoxLayout *headerLayout = new QHBoxLayout(this);
 
-    QLabel *label = new QLabel(i18n("Select the search plugins:"));
+    QLabel *label = new QLabel(i18n("Enable or disable KRunner plugins:"));
 
     QPushButton *clearHistoryButton = new QPushButton(i18n("Clear History"));
     clearHistoryButton->setIcon(QIcon::fromTheme(isRightToLeft() ? QStringLiteral("edit-clear-locationbar-ltr")
diff --git a/kcms/runners/kcm_plasmasearch.desktop b/kcms/runners/kcm_plasmasearch.desktop
--- a/kcms/runners/kcm_plasmasearch.desktop
+++ b/kcms/runners/kcm_plasmasearch.desktop
@@ -10,7 +10,7 @@
 X-KDE-System-Settings-Parent-Category=search
 X-KDE-Weight=20
 
-Name=Plasma Search
+Name=KRunner
 Name[ar]=بحث بلازما
 Name[bs]=Plazma pretraga
 Name[ca]=Cerca de Plasma