diff --git a/src/plugins/mcusupport/mcusupportconstants.h b/src/plugins/mcusupport/mcusupportconstants.h
index 952b04881a4..855525b6759 100644
--- a/src/plugins/mcusupport/mcusupportconstants.h
+++ b/src/plugins/mcusupport/mcusupportconstants.h
@@ -49,5 +49,6 @@ const char SETTINGS_KEY_AUTOMATIC_KIT_CREATION[]{"AutomaticKitCreation"};
 
 const char TOOLCHAIN_DIR_CMAKE_VARIABLE[]{"QUL_TARGET_TOOLCHAIN_DIR"};
 const char TOOLCHAIN_FILE_CMAKE_VARIABLE[]{"CMAKE_TOOLCHAIN_FILE"};
+
 } // namespace Constants
 } // namespace McuSupport
diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp
index ba03994c4a5..b06538d543a 100644
--- a/src/plugins/mcusupport/mcusupportsdk.cpp
+++ b/src/plugins/mcusupport/mcusupportsdk.cpp
@@ -480,7 +480,7 @@ static QList<PackageDescription> parsePackages(const QJsonArray &cmakeEntries)
     QList<PackageDescription> result;
     for (const auto &cmakeEntryRef : cmakeEntries) {
         const QJsonObject cmakeEntry{cmakeEntryRef.toObject()};
-        result.push_back({cmakeEntry["id"].toString(),
+        result.push_back({cmakeEntry["label"].toString(),
                           cmakeEntry["envVar"].toString(),
                           cmakeEntry["cmakeVar"].toString(),
                           cmakeEntry["description"].toString(),
diff --git a/src/plugins/mcusupport/test/armgcc_nxp_1050_json.h b/src/plugins/mcusupport/test/armgcc_nxp_1050_json.h
index f838b05065b..44766d16e9e 100644
--- a/src/plugins/mcusupport/test/armgcc_nxp_1050_json.h
+++ b/src/plugins/mcusupport/test/armgcc_nxp_1050_json.h
@@ -39,14 +39,14 @@ constexpr auto armgcc_nxp_1050_json = R"({
     "cmakeEntries": [
       {
         "id": "Qul_DIR",
-        "description": "Qt for MCUs SDK",
+        "label": "Qt for MCUs SDK",
         "type": "path",
         "cmakeVar": "Qul_ROOT",
         "optional": false
       },
       {
         "id": "MCU_XPRESSO_PATH",
-        "description": "MCUXpresso IDE",
+        "label": "MCUXpresso IDE",
         "type": "path",
         "cmakeVar": "MCUXPRESSO_IDE_PATH",
         "defaultValue": {
@@ -65,14 +65,16 @@ constexpr auto armgcc_nxp_1050_json = R"({
     "cmakeEntries": [
       {
         "id": "ARMGCC_DIR",
-        "description": "GNU Arm Embedded Toolchain",
+        "label": "GNU Arm Embedded Toolchain",
         "cmakeVar": "QUL_TARGET_TOOLCHAIN_DIR",
+        "envVar": "ARMGCC_DIR",
+        "setting": "GNUArmEmbeddedToolchain",
         "type": "path",
         "optional": false
       },
       {
         "id": "ARMGCC_CMAKE_TOOLCHAIN_FILE",
-        "description": "CMake Toolchain File",
+        "label": "CMake Toolchain File",
         "cmakeVar": "CMAKE_TOOLCHAIN_FILE",
         "type": "file",
         "defaultValue": "$Qul_ROOT/lib/cmake/Qul/toolchain/armgcc.cmake",
@@ -89,7 +91,7 @@ constexpr auto armgcc_nxp_1050_json = R"({
     "cmakeEntries": [
       {
         "id": "NXP_SDK_DIR",
-        "description": "Board SDK for MIMXRT1050-EVK",
+        "label": "Board SDK for MIMXRT1050-EVK",
         "cmakeVar": "QUL_BOARD_SDK_DIR",
         "type": "path",
         "optional": false
@@ -101,7 +103,7 @@ constexpr auto armgcc_nxp_1050_json = R"({
     "cmakeEntries": [
       {
         "id": "NXP_FREERTOS_DIR",
-        "description": "FreeRTOS SDK for MIMXRT1050-EVK",
+        "label": "FreeRTOS SDK for MIMXRT1050-EVK",
         "cmakeVar": "FREERTOS_DIR",
         "defaultValue": "$QUL_BOARD_SDK_DIR/rtos/freertos/freertos_kernel",
         "type": "path",
diff --git a/src/plugins/mcusupport/test/armgcc_stm32f769i_freertos_json.h b/src/plugins/mcusupport/test/armgcc_stm32f769i_freertos_json.h
index 1695d83244e..d8fbca0909a 100644
--- a/src/plugins/mcusupport/test/armgcc_stm32f769i_freertos_json.h
+++ b/src/plugins/mcusupport/test/armgcc_stm32f769i_freertos_json.h
@@ -38,7 +38,7 @@ constexpr auto armgcc_stm32f769i_freertos_json = R"({
       {
         "id": "STM32CubeProgrammer_PATH",
         "id": "STM32CubeProgrammer_PATH",
-        "description": "STM32CubeProgrammer",
+        "label": "STM32CubeProgrammer",
         "type": "path",
         "defaultValue": {
           "windows": "$PROGRAMSANDFILES/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
@@ -48,12 +48,12 @@ constexpr auto armgcc_stm32f769i_freertos_json = R"({
       }
     ],
     "environmentEntries": [],
-    "cmakeCacheEntries": [
+    "cmakeEntries": [
       {
         "id": "Qul_DIR",
-        "description": "Qt for MCUs SDK",
+        "label": "Qt for MCUs SDK",
         "type": "path",
-        "cmakeOptionName": "Qul_ROOT",
+        "cmakeVar": "Qul_ROOT",
         "optional": false
       }
     ]
@@ -63,18 +63,20 @@ constexpr auto armgcc_stm32f769i_freertos_json = R"({
     "versions": [
       "9.3.1"
     ],
-    "cmakeCacheEntries": [
+    "cmakeEntries": [
       {
         "id": "ARMGCC_DIR",
-        "description": "GNU Arm Embedded Toolchain",
-        "cmakeOptionName": "QUL_TARGET_TOOLCHAIN_DIR",
+        "label": "GNU Arm Embedded Toolchain",
+        "cmakeVar": "QUL_TARGET_TOOLCHAIN_DIR",
+        "envVar": "ARMGCC_DIR",
+        "setting": "GNUArmEmbeddedToolchain",
         "type": "path",
         "optional": false
       },
       {
         "id": "ARMGCC_CMAKE_TOOLCHAIN_FILE",
-        "description": "CMake Toolchain File",
-        "cmakeOptionName": "CMAKE_TOOLCHAIN_FILE",
+        "label": "CMake Toolchain File",
+        "cmakeVar": "CMAKE_TOOLCHAIN_FILE",
         "type": "file",
         "defaultValue": "$Qul_ROOT/lib/cmake/Qul/toolchain/armgcc.cmake",
         "visible": false,
@@ -87,11 +89,11 @@ constexpr auto armgcc_stm32f769i_freertos_json = R"({
     "versions": [
       "1.16.0"
     ],
-    "cmakeCacheEntries": [
+    "cmakeEntries": [
       {
         "id": "ST_SDK_DIR",
-        "description": "Board SDK for STM32F769I-Discovery",
-        "cmakeOptionName": "QUL_BOARD_SDK_DIR",
+        "label": "Board SDK for STM32F769I-Discovery",
+        "cmakeVar": "QUL_BOARD_SDK_DIR",
         "type": "path",
         "optional": false
       }
@@ -99,11 +101,11 @@ constexpr auto armgcc_stm32f769i_freertos_json = R"({
   },
   "freeRTOS": {
     "envVar": "STM32F7_FREERTOS_DIR",
-    "cmakeCacheEntries": [
+    "cmakeEntries": [
       {
         "id": "ST_FREERTOS_DIR",
-        "description": "FreeRTOS SDK for STM32F769I-Discovery",
-        "cmakeOptionName": "FREERTOS_DIR",
+        "label": "FreeRTOS SDK for STM32F769I-Discovery",
+        "cmakeVar": "FREERTOS_DIR",
         "defaultValue": "$QUL_BOARD_SDK_DIR/Middlewares/Third_Party/FreeRTOS/Source",
         "type": "path",
         "optional": false
diff --git a/src/plugins/mcusupport/test/armgcc_stm32h750b_metal_json.h b/src/plugins/mcusupport/test/armgcc_stm32h750b_metal_json.h
index cac6c89e23f..9225f5dc8c9 100644
--- a/src/plugins/mcusupport/test/armgcc_stm32h750b_metal_json.h
+++ b/src/plugins/mcusupport/test/armgcc_stm32h750b_metal_json.h
@@ -37,7 +37,7 @@ constexpr auto armgcc_stm32h750b_metal_json = R"({
     "pathEntries": [
       {
         "id": "STM32CubeProgrammer_PATH",
-        "description": "STM32CubeProgrammer",
+        "label": "STM32CubeProgrammer",
         "type": "path",
         "defaultValue": {
           "windows": "$PROGRAMSANDFILES/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
@@ -47,12 +47,12 @@ constexpr auto armgcc_stm32h750b_metal_json = R"({
       }
     ],
     "environmentEntries": [],
-    "cmakeCacheEntries": [
+    "cmakeEntries": [
       {
         "id": "Qul_DIR",
-        "description": "Qt for MCUs SDK",
+        "label": "Qt for MCUs SDK",
         "type": "path",
-        "cmakeOptionName": "Qul_ROOT",
+        "cmakeVar": "Qul_ROOT",
         "optional": false
       }
     ]
@@ -65,15 +65,17 @@ constexpr auto armgcc_stm32h750b_metal_json = R"({
     "cmakeEntries": [
       {
         "id": "ARMGCC_DIR",
-        "description": "GNU Arm Embedded Toolchain",
-        "cmakeOptionName": "QUL_TARGET_TOOLCHAIN_DIR",
+        "label": "GNU Arm Embedded Toolchain",
+        "cmakeVar": "QUL_TARGET_TOOLCHAIN_DIR",
+        "envVar": "ARMGCC_DIR",
+        "setting": "GNUArmEmbeddedToolchain",
         "type": "path",
         "optional": false
       },
       {
         "id": "ARMGCC_CMAKE_TOOLCHAIN_FILE",
-        "description": "CMake Toolchain File",
-        "cmakeOptionName": "CMAKE_TOOLCHAIN_FILE",
+        "label": "CMake Toolchain File",
+        "cmakeVar": "CMAKE_TOOLCHAIN_FILE",
         "type": "file",
         "defaultValue": "$Qul_ROOT/lib/cmake/Qul/toolchain/armgcc.cmake",
         "visible": false,
@@ -86,11 +88,11 @@ constexpr auto armgcc_stm32h750b_metal_json = R"({
     "versions": [
       "1.5.0"
     ],
-    "cmakeCacheEntries": [
+    "cmakeEntries": [
       {
         "id": "ST_SDK_DIR",
-        "description": "Board SDK for STM32H750B-Discovery",
-        "cmakeOptionName": "QUL_BOARD_SDK_DIR",
+        "label": "Board SDK for STM32H750B-Discovery",
+        "cmakeVar": "QUL_BOARD_SDK_DIR",
         "type": "path",
         "optional": false
       }
diff --git a/src/plugins/mcusupport/test/iar_nxp_1064_json.h b/src/plugins/mcusupport/test/iar_nxp_1064_json.h
index a517caf0dfe..d0928574ee8 100644
--- a/src/plugins/mcusupport/test/iar_nxp_1064_json.h
+++ b/src/plugins/mcusupport/test/iar_nxp_1064_json.h
@@ -32,7 +32,7 @@ constexpr auto iar_nxp_1064_json = R"({
         "cmakeEntries": [
             {
                 "cmakeVar": "QUL_BOARD_SDK_DIR",
-                "description": "Board SDK for MIMXRT1064-EVK",
+                "label": "Board SDK for MIMXRT1064-EVK",
                 "id": "NXP_SDK_DIR",
                 "optional": false,
                 "type": "path",
@@ -50,7 +50,7 @@ constexpr auto iar_nxp_1064_json = R"({
                 "cmakeVar": "FREERTOS_DIR",
                 "defaultValue": "$QUL_BOARD_SDK_DIR/rtos/freertos/freertos_kernel",
                 "label": "FreeRTOS Sources (IMXRT1064) ",
-                "description": "FreeRTOS SDK for MIMXRT1064-EVK",
+                "label": "FreeRTOS SDK for MIMXRT1064-EVK",
                 "id": "NXP_FREERTOS_DIR",
                 "optional": false,
                 "type": "path"
@@ -62,7 +62,7 @@ constexpr auto iar_nxp_1064_json = R"({
         "cmakeEntries": [
             {
                 "cmakeVar": "Qul_ROOT",
-                "description": "Qt for MCUs SDK",
+                "label": "Qt for MCUs SDK",
                 "id": "Qul_DIR",
                 "optional": false,
                 "type": "path"
@@ -87,7 +87,7 @@ constexpr auto iar_nxp_1064_json = R"({
             {
                 "id": "IAR_DIR",
                 "cmakeVar": "QUL_TARGET_TOOLCHAIN_DIR",
-                "description": "IAR ARM Compiler",
+                "label": "IAR ARM Compiler",
                 "optional": false,
                 "type": "path"
             }
diff --git a/src/plugins/mcusupport/test/iar_stm32f469i_metal_json.h b/src/plugins/mcusupport/test/iar_stm32f469i_metal_json.h
index a61ad866222..2a4f75a9f53 100644
--- a/src/plugins/mcusupport/test/iar_stm32f469i_metal_json.h
+++ b/src/plugins/mcusupport/test/iar_stm32f469i_metal_json.h
@@ -37,7 +37,7 @@ constexpr auto iar_stm32f469i_metal_json = R"({
     "pathEntries": [
       {
         "id": "STM32CubeProgrammer_PATH",
-        "description": "STM32CubeProgrammer",
+        "label": "STM32CubeProgrammer",
         "type": "path",
         "defaultValue": {
           "windows": "$PROGRAMSANDFILES/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
@@ -50,7 +50,7 @@ constexpr auto iar_stm32f469i_metal_json = R"({
     "cmakeEntries": [
       {
         "id": "Qul_DIR",
-        "description": "Qt for MCUs SDK",
+        "label": "Qt for MCUs SDK",
         "type": "path",
         "cmakeVar": "Qul_ROOT",
         "optional": false
@@ -67,14 +67,14 @@ constexpr auto iar_stm32f469i_metal_json = R"({
         "id": "IARToolchain",
         "setting": "IARToolchain",
         "envVar": "IAR_ARM_COMPILER_DIR",
-        "description": "IAR ARM Compiler",
+        "label": "IAR ARM Compiler",
         "cmakeVar": "QUL_TARGET_TOOLCHAIN_DIR",
         "type": "path",
         "optional": false
       },
       {
         "id": "IAR_CMAKE_TOOLCHAIN_FILE",
-        "description": "CMake Toolchain File",
+        "label": "CMake Toolchain File",
         "cmakeVar": "CMAKE_TOOLCHAIN_FILE",
         "type": "file",
         "defaultValue": "$Qul_ROOT/lib/cmake/Qul/toolchain/iar.cmake",
@@ -91,7 +91,7 @@ constexpr auto iar_stm32f469i_metal_json = R"({
     "cmakeEntries": [
       {
         "id": "ST_SDK_DIR",
-        "description": "Board SDK for STM32F469I-Discovery",
+        "label": "Board SDK for STM32F469I-Discovery",
         "cmakeVar": "QUL_BOARD_SDK_DIR",
         "type": "path",
         "optional": false
diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp
index 87a5358c2e3..b164f20010c 100644
--- a/src/plugins/mcusupport/test/unittest.cpp
+++ b/src/plugins/mcusupport/test/unittest.cpp
@@ -82,6 +82,7 @@ const char nxp1170[]{"EVK_MIMXRT1170"};
 const char stm32f7FreeRtosEnvVar[]{"STM32F7_FREERTOS_DIR"};
 const char stm32f7[]{"STM32F7"};
 const char unsupported[]{"unsupported"};
+const char cmakeToolchainLabel[]{"CMake Toolchain File"};
 
 const QStringList jsonFiles{QString::fromUtf8(armgcc_nxp_1050_json),
                             QString::fromUtf8(iar_nxp_1064_json)};
@@ -117,6 +118,7 @@ void verifyIarToolchain(const McuToolChainPackage *iarToolchainPackage)
     QCOMPARE(iarToolchainPackage->isDesktopToolchain(), false);
     QCOMPARE(iarToolchainPackage->toolChainName(), iar);
     QCOMPARE(iarToolchainPackage->toolchainType(), McuToolChainPackage::ToolChainType::IAR);
+    QCOMPARE(iarToolchainPackage->label(), iarLabel);
 
     ProjectExplorer::ToolChainFactory toolchainFactory;
     Utils::Id iarId{BareMetal::Constants::IAREW_TOOLCHAIN_TYPEID};
@@ -197,13 +199,12 @@ void McuSupportTest::test_parseToolchainFromJSON()
 
     const Sdk::PackageDescription &compilerPackage{description.toolchain.packages.at(0)};
     QCOMPARE(compilerPackage.cmakeVar, Constants::TOOLCHAIN_DIR_CMAKE_VARIABLE);
-    QCOMPARE(compilerPackage.envVar, "IAR_ARM_COMPILER_DIR");
+    QCOMPARE(compilerPackage.envVar, iarEnvVar);
 
     const Sdk::PackageDescription &toolchainFilePackage{description.toolchain.packages.at(1)};
-    QCOMPARE(toolchainFilePackage.label, "IAR_CMAKE_TOOLCHAIN_FILE");
+    QCOMPARE(toolchainFilePackage.label, cmakeToolchainLabel);
     QCOMPARE(toolchainFilePackage.envVar, QString{});
     QCOMPARE(toolchainFilePackage.cmakeVar, Constants::TOOLCHAIN_FILE_CMAKE_VARIABLE);
-    QCOMPARE(toolchainFilePackage.description, "CMake Toolchain File");
     QCOMPARE(toolchainFilePackage.defaultPath, "$Qul_ROOT/lib/cmake/Qul/toolchain/iar.cmake");
 }