diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/FreeRTOSConfig.h
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/FreeRTOSConfig.h
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/FreeRTOSConfig.h
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/RTOSDemo.ewd b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.ewd
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/RTOSDemo.ewd
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.ewd
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/RTOSDemo.ewp b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.ewp
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/RTOSDemo.ewp
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.ewp
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/RTOSDemo.eww b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.eww
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/RTOSDemo.eww
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.eww
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/RegTest.s b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RegTest.s
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/RegTest.s
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RegTest.s
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/XMC4500_Flash.icf b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/XMC4500_Flash.icf
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/XMC4500_Flash.icf
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/XMC4500_Flash.icf
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/main.c b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/main.c
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/main.c
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/main.c
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/main_blinky.c b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/main_blinky.c
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/main_blinky.c
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/main_blinky.c
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/main_full.c b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/main_full.c
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/main_full.c
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/main_full.c
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/System_XMC4200.c b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/System_XMC4200.c
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/System_XMC4200.c
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/System_XMC4200.c
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/System_XMC4400.c b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/System_XMC4400.c
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/System_XMC4400.c
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/System_XMC4400.c
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/XMC4200.h b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/XMC4200.h
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/XMC4200.h
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/XMC4200.h
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/XMC4400.h b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/XMC4400.h
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/XMC4400.h
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/XMC4400.h
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/XMC4500.h b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/XMC4500.h
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/XMC4500.h
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/XMC4500.h
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/startup_XMC4200.s b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/startup_XMC4200.s
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/startup_XMC4200.s
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/startup_XMC4200.s
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/startup_XMC4400.s b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/startup_XMC4400.s
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/startup_XMC4400.s
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/startup_XMC4400.s
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/startup_XMC4500.s b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/startup_XMC4500.s
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/startup_XMC4500.s
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/startup_XMC4500.s
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/system_XMC4200.h b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/system_XMC4200.h
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/system_XMC4200.h
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/system_XMC4200.h
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/system_XMC4400.h b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/system_XMC4400.h
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/system_XMC4400.h
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/system_XMC4400.h
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/system_XMC4500.c b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/system_XMC4500.c
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/system_XMC4500.c
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/system_XMC4500.c
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/system_XMC4500.h b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/system_XMC4500.h
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_IAR/system/system_XMC4500.h
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/system/system_XMC4500.h
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/Dbg_Flash.ini b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/Dbg_Flash.ini
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/Dbg_Flash.ini
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/Dbg_Flash.ini
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/Dbg_RAM TraceETM.ini b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/Dbg_RAM TraceETM.ini
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/Dbg_RAM TraceETM.ini
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/Dbg_RAM TraceETM.ini
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/Dbg_RAM.ini b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/Dbg_RAM.ini
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/Dbg_RAM.ini
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/Dbg_RAM.ini
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/FreeRTOSConfig.h
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/FreeRTOSConfig.h
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/FreeRTOSConfig.h
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/RTOSDemo.uvopt b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/RTOSDemo.uvopt
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/RTOSDemo.uvopt
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/RTOSDemo.uvopt
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/RTOSDemo.uvproj b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/RTOSDemo.uvproj
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/RTOSDemo.uvproj
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/RTOSDemo.uvproj
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/RegTest.c b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/RegTest.c
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/RegTest.c
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/RegTest.c
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/System_XMC4500.c b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/System_XMC4500.c
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/System_XMC4500.c
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/System_XMC4500.c
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/System_XMC4500.h b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/System_XMC4500.h
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/System_XMC4500.h
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/System_XMC4500.h
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/Template.sct b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/Template.sct
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/Template.sct
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/Template.sct
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/main.c b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/main.c
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/main.c
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/main.c
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/main_blinky.c b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/main_blinky.c
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/main_blinky.c
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/main_blinky.c
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/main_full.c b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/main_full.c
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/main_full.c
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/main_full.c
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/startup_XMC4200.s b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/startup_XMC4200.s
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/startup_XMC4200.s
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/startup_XMC4200.s
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/startup_XMC4400.s b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/startup_XMC4400.s
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/startup_XMC4400.s
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/startup_XMC4400.s
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/startup_XMC4500.s b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/startup_XMC4500.s
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/startup_XMC4500.s
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/startup_XMC4500.s
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/system_XMC4200.c b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/system_XMC4200.c
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/system_XMC4200.c
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/system_XMC4200.c
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/system_XMC4200.h b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/system_XMC4200.h
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/system_XMC4200.h
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/system_XMC4200.h
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/system_XMC4400.c b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/system_XMC4400.c
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/system_XMC4400.c
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/system_XMC4400.c
diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/system_XMC4400.h b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/system_XMC4400.h
similarity index 100%
rename from FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4500_Keil/system_XMC4400.h
rename to FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/system_XMC4400.h