diff --git a/config/ci-config-matrix-ifx-lib.yml b/config/ci-config-matrix-ifx-lib.yml
index b0330fe..99abaad 100644
--- a/config/ci-config-matrix-ifx-lib.yml
+++ b/config/ci-config-matrix-ifx-lib.yml
@@ -5,16 +5,16 @@ fqbn:
   - arduino:renesas_uno:minima
   - arduino:renesas_uno:unor4wifi
   - arduino:samd:mkrzero
-  - Infineon:xmc:XMC1100_XMC2GO
-  - Infineon:xmc:XMC1300_Boot_Kit
-  - Infineon:xmc:XMC1400_XMC2GO
-  - Infineon:xmc:XMC1400_Arduino_Kit
-  - Infineon:xmc:XMC4700_Relax_Kit
-  - Infineon:xmc:XMC1100_Boot_Kit
+  - infineon:xmc:kit_xmc_2go_xmc1100_v1
+  - infineon:xmc:kit_xmc11_boot_001
+  - infineon:xmc:kit_xmc13_boot_001
+  - infineon:xmc:kit_xmc14_2go
+  - infineon:xmc:kit_xmc1400_arduino
+  - infineon:xmc:kit_xmc47_relax
   - infineon:psoc6:cy8ckit_062s2_ai
 
 additional_urls:
   - core: Infineon:xmc
-    url:  https://github.com/Infineon/XMC-for-Arduino/releases/latest/download/package_infineon_index.json
+    url:  https://github.com/Infineon/XMC-for-Arduino/releases/latest/download/package_xmc_index.json
   - core: infineon:psoc6
     url:  https://github.com/Infineon/arduino-core-psoc6/releases/latest/download/package_psoc6_index.json
\ No newline at end of file
diff --git a/tests/ino-ci-xmc-core.test b/tests/ino-ci-xmc-core.test
index 01b4e47..7c28c39 100644
--- a/tests/ino-ci-xmc-core.test
+++ b/tests/ino-ci-xmc-core.test
@@ -4,9 +4,9 @@
 # The ci-matrix-config.yml used is version (commit) a9ddae541a4c7d20d61acc066ca068c15f76401a
 
 
-# 1. List of sketches for XMC1100_Boot_Kit
+# 1. List of sketches for KIT_XMC11_BOOT_001
 
-$ python ../arduino-ci.py config --list sketch --filter fqbn=Infineon:xmc:XMC1100_Boot_Kit -r ./../.. --yaml
+$ python ../arduino-ci.py config --list sketch --filter fqbn=infineon:xmc:kit_xmc11_boot_001 -r ./../.. --yaml
 sketch:
 - libraries/DeviceControlXMC/examples/DieTemperatureMeasurement/DieTemperatureMeasurement.ino
 - libraries/DeviceControlXMC/examples/HeapMemoryMeasurement/HeapMemoryMeasurement.ino
@@ -20,9 +20,9 @@ sketch:
 
 >=
 
-# 2. List of sketches for XMC1100_XMC2GO
+# 2. List of sketches for KIT_XMC_2GO_XMC1100_V1
 
-$ python ../arduino-ci.py config --list sketch --filter fqbn=Infineon:xmc:XMC1100_XMC2GO -r ./../.. --yaml
+$ python ../arduino-ci.py config --list sketch --filter fqbn=infineon:xmc:kit_xmc_2go_xmc1100_v1 -r ./../.. --yaml
 sketch:
 - libraries/DeviceControlXMC/examples/DieTemperatureMeasurement/DieTemperatureMeasurement.ino
 - libraries/DeviceControlXMC/examples/HeapMemoryMeasurement/HeapMemoryMeasurement.ino
@@ -36,9 +36,9 @@ sketch:
 
 >=
 
-# 3. List of sketches for XMC1300_Boot_Kit
+# 3. List of sketches for KIT_XMC13_BOOT_001
 
-$ python ../arduino-ci.py config --list sketch --filter fqbn=Infineon:xmc:XMC1300_Boot_Kit -r ./../.. --yaml
+$ python ../arduino-ci.py config --list sketch --filter fqbn=infineon:xmc:kit_xmc13_boot_001 -r ./../.. --yaml
 sketch:
 - libraries/DeviceControlXMC/examples/DieTemperatureMeasurement/DieTemperatureMeasurement.ino
 - libraries/DeviceControlXMC/examples/HeapMemoryMeasurement/HeapMemoryMeasurement.ino
@@ -51,9 +51,9 @@ sketch:
 
 >=
 
-# 4. List of sketches for XMC1400_Arduino_Kit
+# 4. List of sketches for KIT_XMC1400_ARDUINO
 
-$ python ../arduino-ci.py config --list sketch --filter fqbn=Infineon:xmc:XMC1400_Arduino_Kit -r ./../.. --yaml
+$ python ../arduino-ci.py config --list sketch --filter fqbn=infineon:xmc:kit_xmc1400_arduino -r ./../.. --yaml
 sketch:
 - libraries/DeviceControlXMC/examples/DieTemperatureMeasurement/DieTemperatureMeasurement.ino
 - libraries/DeviceControlXMC/examples/HeapMemoryMeasurement/HeapMemoryMeasurement.ino
@@ -65,9 +65,9 @@ sketch:
 
 >=
 
-# 5. List of sketches for XMC1400_XMC2GO
+# 5. List of sketches for KIT_XMC14_2GO
 
-$ python ../arduino-ci.py config --list sketch --filter fqbn=Infineon:xmc:XMC1400_XMC2GO -r ./../.. --yaml
+$ python ../arduino-ci.py config --list sketch --filter fqbn=infineon:xmc:kit_xmc14_2go -r ./../.. --yaml
 sketch:
 - libraries/CAN
 - libraries/DeviceControlXMC/examples/DieTemperatureMeasurement/DieTemperatureMeasurement.ino
@@ -81,9 +81,9 @@ sketch:
 
 >=
 
-# 6. List of sketches for XMC4200_Platform2GO
+# 6. List of sketches for KIT_XMC_PLT2GO_XMC4200
 
-$ python ../arduino-ci.py config --list sketch --filter fqbn=Infineon:xmc:XMC4200_Platform2GO -r ./../.. --yaml
+$ python ../arduino-ci.py config --list sketch --filter fqbn=infineon:xmc:kit_xmc_plt2go_xmc4200 -r ./../.. --yaml
 sketch:
 - libraries/CAN
 - libraries/DeviceControlXMC/examples/StackMemoryMeasurement/StackMemoryMeasurement.ino
@@ -95,9 +95,9 @@ sketch:
 
 >=
 
-# 7. List of sketches for XMC4400_Platform2GO
+# 7. List of sketches for KIT_XMC_PLT2GO_XMC4400
 
-$ python ../arduino-ci.py config --list sketch --filter fqbn=Infineon:xmc:XMC4400_Platform2GO -r ./../.. --yaml
+$ python ../arduino-ci.py config --list sketch --filter fqbn=infineon:xmc:kit_xmc_plt2go_xmc4400 -r ./../.. --yaml
 sketch:
 - libraries/CAN
 - libraries/DeviceControlXMC/examples/StackMemoryMeasurement/StackMemoryMeasurement.ino
@@ -108,9 +108,9 @@ sketch:
 
 >=
 
-# 8. List of sketches for XMC4700_Relax_Kit
+# 8. List of sketches for KIT_XMC47_RELAX
 
-$ python ../arduino-ci.py config --list sketch --filter fqbn=Infineon:xmc:XMC4700_Relax_Kit -r ./../.. --yaml
+$ python ../arduino-ci.py config --list sketch --filter fqbn=infineon:xmc:kit_xmc47_relax -r ./../.. --yaml
 sketch:
 - libraries/CAN
 - libraries/DeviceControlXMC/examples/DieTemperatureMeasurement/DieTemperatureMeasurement.ino