diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index aa430eb691cad8950a7970d93e822cd86373443b..fa1d2ce7aae8999f7f2033f33a799bb7dfcf5545 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -209,7 +209,7 @@ QString CMakeProject::shadowBuildDirectory(const QString &projectFilePath, const
         return info.absolutePath();
 
     const QString projectName = QFileInfo(info.absolutePath()).fileName();
-    ProjectExplorer::ProjectExpander expander(projectFilePath, projectName, k, bcName);
+    ProjectExplorer::ProjectMacroExpander expander(projectFilePath, projectName, k, bcName);
     QDir projectDir = QDir(projectDirectory(projectFilePath));
     QString buildPath = Utils::expandMacros(Core::DocumentManager::buildDirectory(), &expander);
     return QDir::cleanPath(projectDir.absoluteFilePath(buildPath));
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 52571ceac8f77e11e7efe7e0204b11ae0b293915..29e6e01b6e594b34f2151fb7b8af98b928e6be1f 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -1178,7 +1178,7 @@ void ProjectExplorerPlugin::updateVariable(const QByteArray &variable)
                 }
             }
         }
-        ProjectExpander expander(projectFilePath, projectName, kit, buildConfigurationName);
+        ProjectMacroExpander expander(projectFilePath, projectName, kit, buildConfigurationName);
         QString result;
         if (expander.resolveProjectMacro(QString::fromUtf8(variable), &result))
             Core::VariableManager::insert(variable, result);
diff --git a/src/plugins/projectexplorer/projectmacroexpander.cpp b/src/plugins/projectexplorer/projectmacroexpander.cpp
index 32730d3a95b92142f142f2bcd72ae3895ca62489..13256fcbffc96e27bba82ba51e33b2b438322de1 100644
--- a/src/plugins/projectexplorer/projectmacroexpander.cpp
+++ b/src/plugins/projectexplorer/projectmacroexpander.cpp
@@ -35,12 +35,12 @@
 
 using namespace ProjectExplorer;
 
-ProjectExpander::ProjectExpander(const QString &projectFilePath, const QString &projectName,
+ProjectMacroExpander::ProjectMacroExpander(const QString &projectFilePath, const QString &projectName,
                                  const Kit *k, const QString &bcName)
     : m_projectFile(projectFilePath), m_projectName(projectName), m_kit(k), m_bcName(bcName)
 { }
 
-bool ProjectExpander::resolveProjectMacro(const QString &name, QString *ret)
+bool ProjectMacroExpander::resolveProjectMacro(const QString &name, QString *ret)
 {
     QString result;
     bool found = false;
@@ -75,7 +75,7 @@ bool ProjectExpander::resolveProjectMacro(const QString &name, QString *ret)
     return found;
 }
 
-bool ProjectExpander::resolveMacro(const QString &name, QString *ret)
+bool ProjectMacroExpander::resolveMacro(const QString &name, QString *ret)
 {
     bool found = resolveProjectMacro(name, ret);
     if (!found) {
diff --git a/src/plugins/projectexplorer/projectmacroexpander.h b/src/plugins/projectexplorer/projectmacroexpander.h
index 46181c228d768c308db3f4ea81e4648ceb030d36..8786a08277328eed3f53f5212228cfc524e540f1 100644
--- a/src/plugins/projectexplorer/projectmacroexpander.h
+++ b/src/plugins/projectexplorer/projectmacroexpander.h
@@ -37,10 +37,10 @@
 namespace ProjectExplorer {
 class Kit;
 
-class PROJECTEXPLORER_EXPORT ProjectExpander : public Utils::AbstractQtcMacroExpander
+class PROJECTEXPLORER_EXPORT ProjectMacroExpander : public Utils::AbstractQtcMacroExpander
 {
 public:
-    ProjectExpander(const QString &projectFilePath, const QString &projectName, const Kit *k, const QString &bcName);
+    ProjectMacroExpander(const QString &projectFilePath, const QString &projectName, const Kit *k, const QString &bcName);
     bool resolveProjectMacro(const QString &name, QString *ret);
     bool resolveMacro(const QString &name, QString *ret);
 
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 293404eccae56e36970bf8d63956cd5c15c289e8..1618d46cb0fb14b658be770593b80fb44f3e7568 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -1390,7 +1390,7 @@ QString Qt4Project::shadowBuildDirectory(const QString &proFilePath, const Kit *
         return info.absolutePath();
 
     const QString projectName = QFileInfo(proFilePath).completeBaseName();
-    ProjectExplorer::ProjectExpander expander(proFilePath, projectName, k, suffix);
+    ProjectExplorer::ProjectMacroExpander expander(proFilePath, projectName, k, suffix);
     QDir projectDir = QDir(projectDirectory(proFilePath));
     QString buildPath = Utils::expandMacros(Core::DocumentManager::buildDirectory(), &expander);
     return QDir::cleanPath(projectDir.absoluteFilePath(buildPath));