diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp
index 58b653cd134..ab245890e84 100644
--- a/src/libs/utils/aspects.cpp
+++ b/src/libs/utils/aspects.cpp
@@ -854,7 +854,7 @@ FilePath StringAspect::filePath() const
     return FilePath::fromUserInput(value());
 }
 
-PathChooser *FilePathAspect::pathChooser() const
+PathChooser *StringAspect::pathChooser() const
 {
     return d->m_pathChooserDisplay.data();
 }
@@ -988,21 +988,21 @@ void StringAspect::setHistoryCompleter(const QString &historyCompleterKey)
 
   \sa Utils::PathChooser::setExpectedKind()
 */
-void FilePathAspect::setExpectedKind(const PathChooser::Kind expectedKind)
+void StringAspect::setExpectedKind(const PathChooser::Kind expectedKind)
 {
     d->m_expectedKind = expectedKind;
     if (d->m_pathChooserDisplay)
         d->m_pathChooserDisplay->setExpectedKind(expectedKind);
 }
 
-void FilePathAspect::setEnvironment(const Environment &env)
+void StringAspect::setEnvironment(const Environment &env)
 {
     d->m_environment = env;
     if (d->m_pathChooserDisplay)
         d->m_pathChooserDisplay->setEnvironment(env);
 }
 
-void FilePathAspect::setBaseFileName(const FilePath &baseFileName)
+void StringAspect::setBaseFileName(const FilePath &baseFileName)
 {
     d->m_baseFileName = baseFileName;
     if (d->m_pathChooserDisplay)
diff --git a/src/libs/utils/aspects.h b/src/libs/utils/aspects.h
index 468ccd565af..fc3500dd747 100644
--- a/src/libs/utils/aspects.h
+++ b/src/libs/utils/aspects.h
@@ -465,6 +465,9 @@ public:
     void setDisplayFilter(const std::function<QString (const QString &)> &displayFilter);
     void setPlaceHolderText(const QString &placeHolderText);
     void setHistoryCompleter(const QString &historyCompleterKey);
+    void setExpectedKind(const PathChooser::Kind expectedKind);
+    void setEnvironment(const Environment &env);
+    void setBaseFileName(const FilePath &baseFileName);
     void setUndoRedoEnabled(bool readOnly);
     void setAcceptRichText(bool acceptRichText);
     void setMacroExpanderProvider(const MacroExpanderProvider &expanderProvider);
@@ -497,6 +500,8 @@ public:
 
     FilePath filePath() const;
 
+    PathChooser *pathChooser() const; // Avoid to use.
+
 signals:
     void checkedChanged();
     void validChanged(bool validState);
@@ -523,11 +528,6 @@ public:
     void setAllowPathFromDevice(bool allowPathFromDevice);
     void setValidatePlaceHolder(bool validatePlaceHolder);
     void setOpenTerminalHandler(const std::function<void()> &openTerminal);
-    void setExpectedKind(const PathChooser::Kind expectedKind);
-    void setEnvironment(const Environment &env);
-    void setBaseFileName(const FilePath &baseFileName);
-
-    PathChooser *pathChooser() const; // Avoid to use.
 };
 
 class QTCREATOR_UTILS_EXPORT IntegerAspect : public TypedAspect<qint64>