diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index fa440e48882..46778d36538 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -52744,7 +52744,7 @@ in "%2" aus.
     </message>
 </context>
 <context>
-    <name>ConanPackageManager::Internal::ConanInstallStep</name>
+    <name>Conan</name>
     <message>
         <source>Conan install</source>
         <translation type="unfinished"></translation>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 096213fec15..90fd6cf1c7a 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -47854,7 +47854,7 @@ Output:
     </message>
 </context>
 <context>
-    <name>ConanPackageManager::Internal::ConanInstallStep</name>
+    <name>Conan</name>
     <message>
         <source>Additional arguments:</source>
         <translation>追加の引数:</translation>
diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts
index abf676487c5..4e762e83311 100644
--- a/share/qtcreator/translations/qtcreator_zh_CN.ts
+++ b/share/qtcreator/translations/qtcreator_zh_CN.ts
@@ -8561,7 +8561,7 @@ Set a valid executable first.</source>
     </message>
 </context>
 <context>
-    <name>ConanPackageManager::Internal::ConanInstallStep</name>
+    <name>Conan</name>
     <message>
         <source>Conan install</source>
         <translation type="unfinished"></translation>
diff --git a/src/plugins/conan/conanconstants.h b/src/plugins/conan/conanconstants.h
index 1c0628634d2..bb8dee592f2 100644
--- a/src/plugins/conan/conanconstants.h
+++ b/src/plugins/conan/conanconstants.h
@@ -3,10 +3,8 @@
 
 #pragma once
 
-namespace ConanPackageManager {
-namespace Constants {
+namespace Conan::Constants {
 
 const char INSTALL_STEP[]  = "ConanPackageManager.InstallStep";
 
-} // namespace Constants
-} // namespace ConanPackageManager
+} // Conan::Constants
diff --git a/src/plugins/conan/conaninstallstep.cpp b/src/plugins/conan/conaninstallstep.cpp
index 7b1d620cb89..d0c2ef5bacd 100644
--- a/src/plugins/conan/conaninstallstep.cpp
+++ b/src/plugins/conan/conaninstallstep.cpp
@@ -1,10 +1,12 @@
 // Copyright (C) 2018 Jochen Seemann
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "conanconstants.h"
 #include "conaninstallstep.h"
+
+#include "conanconstants.h"
 #include "conanplugin.h"
 #include "conansettings.h"
+#include "conantr.h"
 
 #include <projectexplorer/abstractprocessstep.h>
 #include <projectexplorer/buildconfiguration.h>
@@ -21,15 +23,12 @@
 using namespace ProjectExplorer;
 using namespace Utils;
 
-namespace ConanPackageManager {
-namespace Internal {
+namespace Conan::Internal {
 
 // ConanInstallStep
 
 class ConanInstallStep final : public AbstractProcessStep
 {
-    Q_DECLARE_TR_FUNCTIONS(ConanPackageManager::Internal::ConanInstallStep)
-
 public:
     ConanInstallStep(BuildStepList *bsl, Id id);
 
@@ -42,20 +41,20 @@ ConanInstallStep::ConanInstallStep(BuildStepList *bsl, Id id)
     : AbstractProcessStep(bsl, id)
 {
     setUseEnglishOutput();
-    setDisplayName(ConanInstallStep::tr("Conan install"));
+    setDisplayName(Tr::tr("Conan install"));
 
     auto conanFile = addAspect<StringAspect>();
     conanFile->setSettingsKey("ConanPackageManager.InstallStep.ConanFile");
     conanFile->setFilePath(ConanPlugin::conanFilePath(project(),
                            project()->projectDirectory() / "conanfile.txt"));
-    conanFile->setLabelText(tr("Conan file:"));
-    conanFile->setToolTip(tr("Enter location of conanfile.txt or conanfile.py."));
+    conanFile->setLabelText(Tr::tr("Conan file:"));
+    conanFile->setToolTip(Tr::tr("Enter location of conanfile.txt or conanfile.py."));
     conanFile->setDisplayStyle(StringAspect::PathChooserDisplay);
     conanFile->setExpectedKind(PathChooser::File);
 
     auto additionalArguments = addAspect<StringAspect>();
     additionalArguments->setSettingsKey("ConanPackageManager.InstallStep.AdditionalArguments");
-    additionalArguments->setLabelText(tr("Additional arguments:"));
+    additionalArguments->setLabelText(Tr::tr("Additional arguments:"));
     additionalArguments->setDisplayStyle(StringAspect::LineEditDisplay);
 
     auto buildMissing = addAspect<BoolAspect>();
@@ -116,8 +115,7 @@ void ConanInstallStep::setupOutputFormatter(OutputFormatter *formatter)
 ConanInstallStepFactory::ConanInstallStepFactory()
 {
     registerStep<ConanInstallStep>(Constants::INSTALL_STEP);
-    setDisplayName(ConanInstallStep::tr("Run conan install"));
+    setDisplayName(Tr::tr("Run conan install"));
 }
 
-} // Internal
-} // ConanPackageManager
+} // Conan::Internal
diff --git a/src/plugins/conan/conaninstallstep.h b/src/plugins/conan/conaninstallstep.h
index c4faa08d91a..6e062e8ecf9 100644
--- a/src/plugins/conan/conaninstallstep.h
+++ b/src/plugins/conan/conaninstallstep.h
@@ -5,8 +5,7 @@
 
 #include <projectexplorer/buildstep.h>
 
-namespace ConanPackageManager {
-namespace Internal {
+namespace Conan::Internal {
 
 class ConanInstallStepFactory final : public ProjectExplorer::BuildStepFactory
 {
@@ -14,5 +13,4 @@ public:
     ConanInstallStepFactory();
 };
 
-} // namespace Internal
-} // namespace ConanPackageManager
+} // Conan::Internal
diff --git a/src/plugins/conan/conanplugin.cpp b/src/plugins/conan/conanplugin.cpp
index 06578c95e08..5b432bf2162 100644
--- a/src/plugins/conan/conanplugin.cpp
+++ b/src/plugins/conan/conanplugin.cpp
@@ -1,17 +1,18 @@
 // Copyright (C) 2018 Jochen Seemann
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
+#include "conanplugin.h"
+
 #include "conanconstants.h"
 #include "conaninstallstep.h"
-#include "conanplugin.h"
 #include "conansettings.h"
 
 #include <coreplugin/icore.h>
+
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildmanager.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/project.h>
-#include <projectexplorer/projectmanager.h>
 #include <projectexplorer/projecttree.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/target.h>
@@ -20,8 +21,7 @@ using namespace Core;
 using namespace ProjectExplorer;
 using namespace Utils;
 
-namespace ConanPackageManager {
-namespace Internal {
+namespace Conan::Internal {
 
 class ConanPluginPrivate
 {
@@ -91,6 +91,4 @@ FilePath ConanPlugin::conanFilePath(Project *project, const FilePath &defaultFil
     return defaultFilePath;
 }
 
-
-} // namespace Internal
-} // namespace ConanPackageManager
+} // Conan::Internal
diff --git a/src/plugins/conan/conanplugin.h b/src/plugins/conan/conanplugin.h
index 4f447a17531..46b7b2618c6 100644
--- a/src/plugins/conan/conanplugin.h
+++ b/src/plugins/conan/conanplugin.h
@@ -4,12 +4,11 @@
 #pragma once
 
 #include <extensionsystem/iplugin.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 namespace ProjectExplorer { class Project; }
 
-namespace ConanPackageManager {
-namespace Internal {
+namespace Conan::Internal {
 
 class ConanSettings;
 
@@ -21,7 +20,7 @@ class ConanPlugin final : public ExtensionSystem::IPlugin
 public:
     static ConanSettings *conanSettings();
     static Utils::FilePath conanFilePath(ProjectExplorer::Project *project,
-                           const Utils::FilePath &defaultFilePath = Utils::FilePath());
+                           const Utils::FilePath &defaultFilePath = {});
 
 private:
     ~ConanPlugin() final;
@@ -33,5 +32,4 @@ private:
     class ConanPluginPrivate *d = nullptr;
 };
 
-} // namespace Internal
-} // namespace ConanPackageManager
+} // Conan::Internal
diff --git a/src/plugins/conan/conansettings.cpp b/src/plugins/conan/conansettings.cpp
index db5c9ad0078..6a608b99f89 100644
--- a/src/plugins/conan/conansettings.cpp
+++ b/src/plugins/conan/conansettings.cpp
@@ -7,8 +7,7 @@
 
 using namespace Utils;
 
-namespace ConanPackageManager {
-namespace Internal {
+namespace Conan::Internal {
 
 ConanSettings::ConanSettings()
 {
@@ -22,5 +21,4 @@ ConanSettings::ConanSettings()
     conanFilePath.setDefaultValue(HostOsInfo::withExecutableSuffix("conan"));
 }
 
-} // Internal
-} // ConanPackageManager
+} // Conan::Internal
diff --git a/src/plugins/conan/conansettings.h b/src/plugins/conan/conansettings.h
index 5b226809ad4..93e61908399 100644
--- a/src/plugins/conan/conansettings.h
+++ b/src/plugins/conan/conansettings.h
@@ -4,12 +4,8 @@
 #pragma once
 
 #include <utils/aspects.h>
-#include <utils/fileutils.h>
 
-#include <QSettings>
-
-namespace ConanPackageManager {
-namespace Internal {
+namespace Conan::Internal {
 
 class ConanSettings : public Utils::AspectContainer
 {
@@ -19,5 +15,4 @@ public:
     Utils::StringAspect conanFilePath;
 };
 
-} // Internal
-} // ConanPackageManager
+} // Conan::Internal
diff --git a/src/plugins/conan/conantr.h b/src/plugins/conan/conantr.h
index c3ddc7c734e..2b57e84b111 100644
--- a/src/plugins/conan/conantr.h
+++ b/src/plugins/conan/conantr.h
@@ -12,4 +12,4 @@ struct Tr
     Q_DECLARE_TR_FUNCTIONS(Conan)
 };
 
-} // namespace Conan
+} // Conan