diff --git a/src/plugins/debugger/debuggerkitconfigwidget.h b/src/plugins/debugger/debuggerkitconfigwidget.h
index 735d02fd01f48d9b03c65c67c62cec10deedf5f2..3c8658ca307d0cdd74137afff314c33ca8ac2353 100644
--- a/src/plugins/debugger/debuggerkitconfigwidget.h
+++ b/src/plugins/debugger/debuggerkitconfigwidget.h
@@ -62,7 +62,7 @@ class DebuggerKitConfigWidget : public ProjectExplorer::KitConfigWidget
     Q_OBJECT
 
 public:
-    DebuggerKitConfigWidget(ProjectExplorer::Kit *p,
+    DebuggerKitConfigWidget(ProjectExplorer::Kit *k,
                             const DebuggerKitInformation *ki,
                             QWidget *parent = 0);
 
diff --git a/src/plugins/debugger/debuggerkitinformation.h b/src/plugins/debugger/debuggerkitinformation.h
index 93f632be76c7a219ec58ea045577964c9dbc174b..3fdfb165e7089ad7318225fde2ab229b77184bce 100644
--- a/src/plugins/debugger/debuggerkitinformation.h
+++ b/src/plugins/debugger/debuggerkitinformation.h
@@ -77,13 +77,13 @@ public:
     static DebuggerItem debuggerItem(const ProjectExplorer::Kit *k);
     static void setDebuggerItem(ProjectExplorer::Kit *k, const DebuggerItem &item);
 
-    static Utils::FileName debuggerCommand(const ProjectExplorer::Kit *p)
-        { return debuggerItem(p).binary; }
+    static Utils::FileName debuggerCommand(const ProjectExplorer::Kit *k)
+        { return debuggerItem(k).binary; }
 
-    static void setDebuggerCommand(ProjectExplorer::Kit *p, const Utils::FileName &command);
+    static void setDebuggerCommand(ProjectExplorer::Kit *k, const Utils::FileName &command);
 
-    static DebuggerEngineType engineType(const ProjectExplorer::Kit *p)
-        { return debuggerItem(p).engineType; }
+    static DebuggerEngineType engineType(const ProjectExplorer::Kit *k)
+        { return debuggerItem(k).engineType; }
 
     static void setEngineType(ProjectExplorer::Kit *k, DebuggerEngineType type);
 
diff --git a/src/plugins/projectexplorer/kitinformation.h b/src/plugins/projectexplorer/kitinformation.h
index ce6a6749dd756f23132cffddca2c44b35196a8f9..84127020d69afe58165d4b74d0d747e592ca7b76 100644
--- a/src/plugins/projectexplorer/kitinformation.h
+++ b/src/plugins/projectexplorer/kitinformation.h
@@ -78,9 +78,9 @@ public:
     SysRootMatcher(const Utils::FileName &fn) : m_sysroot(fn)
     { }
 
-    bool matches(const Kit *p) const
+    bool matches(const Kit *k) const
     {
-        return SysRootKitInformation::sysRoot(p) == m_sysroot;
+        return SysRootKitInformation::sysRoot(k) == m_sysroot;
     }
 
 private:
@@ -125,9 +125,9 @@ public:
     ToolChainMatcher(const ToolChain *tc) : m_tc(tc)
     { }
 
-    bool matches(const Kit *p) const
+    bool matches(const Kit *k) const
     {
-        return ToolChainKitInformation::toolChain(p) == m_tc;
+        return ToolChainKitInformation::toolChain(k) == m_tc;
     }
 
 private:
@@ -166,9 +166,9 @@ public:
     DeviceTypeMatcher(const Core::Id t) : m_type(t)
     { }
 
-    bool matches(const Kit *p) const
+    bool matches(const Kit *k) const
     {
-        Core::Id deviceType = DeviceTypeKitInformation::deviceTypeId(p);
+        Core::Id deviceType = DeviceTypeKitInformation::deviceTypeId(k);
         if (!deviceType.isValid())
             return false;
         return deviceType == m_type;
@@ -214,9 +214,9 @@ public:
     DeviceMatcher(Core::Id id) : m_devId(id)
     { }
 
-    bool matches(const Kit *p) const
+    bool matches(const Kit *k) const
     {
-        return DeviceKitInformation::deviceId(p) == m_devId;
+        return DeviceKitInformation::deviceId(k) == m_devId;
     }
 
 private:
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index 28ebdf373f19e14ce89c46072a59cb33ae25a999..0fd4265785da252878020edff53e8b2b2d0d180e 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -266,7 +266,7 @@ Target *Project::restoreTarget(const QVariantMap &data)
 
     Kit *k = KitManager::instance()->find(id);
     if (!k) {
-        qWarning("Warning: No profile '%s' found. Continuing.", qPrintable(id.toString()));
+        qWarning("Warning: No kit '%s' found. Continuing.", qPrintable(id.toString()));
         return 0;
     }
 
diff --git a/src/plugins/projectexplorer/target.h b/src/plugins/projectexplorer/target.h
index ad12c27ebd956c44a2cee1e42f91037d31ce7a67..98a874c15755e82c78957f4878fc1f4d34f6291b 100644
--- a/src/plugins/projectexplorer/target.h
+++ b/src/plugins/projectexplorer/target.h
@@ -59,7 +59,7 @@ class PROJECTEXPLORER_EXPORT Target : public ProjectConfiguration
     Q_OBJECT
 
 public:
-    Target(Project *parent, Kit *p);
+    Target(Project *parent, Kit *k);
     ~Target();
 
     Project *project() const;