diff --git a/src/plugins/mcusupport/CMakeLists.txt b/src/plugins/mcusupport/CMakeLists.txt
index cebf2e1a038..c5ce1bfa64c 100644
--- a/src/plugins/mcusupport/CMakeLists.txt
+++ b/src/plugins/mcusupport/CMakeLists.txt
@@ -2,7 +2,7 @@ add_qtc_plugin(McuSupport
   DEPENDS Qt::Core QmlJS
   PLUGIN_DEPENDS Core BareMetal ProjectExplorer Debugger CMakeProjectManager QtSupport
   SOURCES
-    mcukitinformation.cpp mcukitinformation.h
+    mcukitaspect.cpp mcukitaspect.h
     mcusupport.qrc
     mcusupport_global.h
     mcusupporttr.h
diff --git a/src/plugins/mcusupport/mcukitinformation.cpp b/src/plugins/mcusupport/mcukitaspect.cpp
similarity index 99%
rename from src/plugins/mcusupport/mcukitinformation.cpp
rename to src/plugins/mcusupport/mcukitaspect.cpp
index b1771974375..e8cbda6c3d9 100644
--- a/src/plugins/mcusupport/mcukitinformation.cpp
+++ b/src/plugins/mcusupport/mcukitaspect.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2021 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "mcukitinformation.h"
+#include "mcukitaspect.h"
 #include "mcusupporttr.h"
 
 #include <cmakeprojectmanager/cmakekitinformation.h>
diff --git a/src/plugins/mcusupport/mcukitinformation.h b/src/plugins/mcusupport/mcukitaspect.h
similarity index 100%
rename from src/plugins/mcusupport/mcukitinformation.h
rename to src/plugins/mcusupport/mcukitaspect.h
diff --git a/src/plugins/mcusupport/mcukitmanager.cpp b/src/plugins/mcusupport/mcukitmanager.cpp
index 2c13da6fc13..22741158390 100644
--- a/src/plugins/mcusupport/mcukitmanager.cpp
+++ b/src/plugins/mcusupport/mcukitmanager.cpp
@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "mcukitmanager.h"
-#include "mculegacyconstants.h"
-#include "mcusupport_global.h"
-#include "mcusupportoptions.h"
 
-#include "mcukitinformation.h"
+#include "mcukitaspect.h"
+#include "mculegacyconstants.h"
 #include "mcupackage.h"
+#include "mcusupport_global.h"
 #include "mcusupportconstants.h"
+#include "mcusupportoptions.h"
 #include "mcusupportplugin.h"
 #include "mcusupportsdk.h"
 #include "mcusupporttr.h"
@@ -16,7 +16,6 @@
 
 #include <cmakeprojectmanager/cmakekitinformation.h>
 #include <cmakeprojectmanager/cmaketoolmanager.h>
-#include <coreplugin/icore.h>
 
 #include <debugger/debuggeritem.h>
 #include <debugger/debuggeritemmanager.h>
diff --git a/src/plugins/mcusupport/mcusupport.qbs b/src/plugins/mcusupport/mcusupport.qbs
index ca9f0eb4db4..752b6a3e6ff 100644
--- a/src/plugins/mcusupport/mcusupport.qbs
+++ b/src/plugins/mcusupport/mcusupport.qbs
@@ -52,8 +52,8 @@ QtcPlugin {
         "mcusupportversiondetection.cpp",
         "mcusupportversiondetection.h",
         "mcutargetdescription.h",
-        "mcukitinformation.cpp",
-        "mcukitinformation.h",
+        "mcukitaspect.cpp",
+        "mcukitaspect.h",
         "mcuhelpers.cpp",
         "mcuhelpers.h",
         "settingshandler.h",