diff --git a/include/arch/infineon-tc1796-starter-kit/driver/counter.h b/include/arch/infineon-tc1796-mock/driver/counter.h
similarity index 100%
rename from include/arch/infineon-tc1796-starter-kit/driver/counter.h
rename to include/arch/infineon-tc1796-mock/driver/counter.h
diff --git a/include/arch/infineon-tc1796-starter-kit/driver/gpio.h b/include/arch/infineon-tc1796-mock/driver/gpio.h
similarity index 100%
rename from include/arch/infineon-tc1796-starter-kit/driver/gpio.h
rename to include/arch/infineon-tc1796-mock/driver/gpio.h
diff --git a/include/arch/infineon-tc1796-starter-kit/driver/stdout.h b/include/arch/infineon-tc1796-mock/driver/stdout.h
similarity index 100%
rename from include/arch/infineon-tc1796-starter-kit/driver/stdout.h
rename to include/arch/infineon-tc1796-mock/driver/stdout.h
diff --git a/include/arch/infineon-tc1796-starter-kit/driver/uptime.h b/include/arch/infineon-tc1796-mock/driver/uptime.h
similarity index 100%
rename from include/arch/infineon-tc1796-starter-kit/driver/uptime.h
rename to include/arch/infineon-tc1796-mock/driver/uptime.h
diff --git a/include/arch/infineon-tc397-tft-kit/driver/counter.h b/include/arch/infineon-tc397-mock/driver/counter.h
similarity index 100%
rename from include/arch/infineon-tc397-tft-kit/driver/counter.h
rename to include/arch/infineon-tc397-mock/driver/counter.h
diff --git a/include/arch/infineon-tc397-tft-kit/driver/gpio.h b/include/arch/infineon-tc397-mock/driver/gpio.h
similarity index 100%
rename from include/arch/infineon-tc397-tft-kit/driver/gpio.h
rename to include/arch/infineon-tc397-mock/driver/gpio.h
diff --git a/include/arch/infineon-tc397-tft-kit/driver/stdout.h b/include/arch/infineon-tc397-mock/driver/stdout.h
similarity index 100%
rename from include/arch/infineon-tc397-tft-kit/driver/stdout.h
rename to include/arch/infineon-tc397-mock/driver/stdout.h
diff --git a/include/arch/infineon-tc397-tft-kit/driver/uptime.h b/include/arch/infineon-tc397-mock/driver/uptime.h
similarity index 100%
rename from include/arch/infineon-tc397-tft-kit/driver/uptime.h
rename to include/arch/infineon-tc397-mock/driver/uptime.h
diff --git a/src/arch/infineon-tc1796-starter-kit/Kconfig b/src/arch/infineon-tc1796-mock/Kconfig
similarity index 100%
rename from src/arch/infineon-tc1796-starter-kit/Kconfig
rename to src/arch/infineon-tc1796-mock/Kconfig
diff --git a/src/arch/infineon-tc1796-starter-kit/Makefile.inc b/src/arch/infineon-tc1796-mock/Makefile.inc
similarity index 84%
rename from src/arch/infineon-tc1796-starter-kit/Makefile.inc
rename to src/arch/infineon-tc1796-mock/Makefile.inc
index 27b9322ce1af64cfca79fe31cd2b829324ee4871..223a079a4b71133598af0c4c6b9fb5cab88d2446 100644
--- a/src/arch/infineon-tc1796-starter-kit/Makefile.inc
+++ b/src/arch/infineon-tc1796-mock/Makefile.inc
@@ -17,9 +17,9 @@ OBJCOPY = wine ${HOME}/.wine/drive_c/HighTec/toolchains/tricore/v4.9.3.0-infineo
 OBJDUMP = wine ${HOME}/.wine/drive_c/HighTec/toolchains/tricore/v4.9.3.0-infineon-1.0/bin/tricore-objdump.exe ${LICENSE}
 SIZE =    wine ${HOME}/.wine/drive_c/HighTec/toolchains/tricore/v4.9.3.0-infineon-1.0/bin/tricore-size.exe
 
-CXX_TARGETS += src/arch/infineon-tc1796-starter-kit/arch.cc
-CXX_TARGETS += src/arch/infineon-tc1796-starter-kit/driver/gpio.cc
-CXX_TARGETS += src/arch/infineon-tc1796-starter-kit/driver/stdout.cc
+CXX_TARGETS += src/arch/infineon-tc1796-mock/arch.cc
+CXX_TARGETS += src/arch/infineon-tc1796-mock/driver/gpio.cc
+CXX_TARGETS += src/arch/infineon-tc1796-mock/driver/stdout.cc
 
 ifneq (${cpu_freq}, )
 	COMMON_FLAGS += -DF_CPU=${cpu_freq}UL
@@ -28,11 +28,11 @@ else
 endif
 
 ifneq ($(findstring counter,${arch_drivers}), )
-	CONFIG_arch_infineon_tc1796_starter_kit_driver_counter = y
+	CONFIG_arch_infineon_tc1796_mock_driver_counter = y
 endif
 
-ifdef CONFIG_arch_infineon_tc1796_starter_kit_driver_counter
-	CXX_TARGETS += src/arch/infineon-tc1796-starter-kit/driver/counter.cc
+ifdef CONFIG_arch_infineon_tc1796_mock_driver_counter
+	CXX_TARGETS += src/arch/infineon-tc1796-mock/driver/counter.cc
 endif
 
 OBJECTS = ${CXX_TARGETS:.cc=.o} ${C_TARGETS:.c=.o} ${ASM_TARGETS:.S=.o}
diff --git a/src/arch/infineon-tc1796-starter-kit/arch.cc b/src/arch/infineon-tc1796-mock/arch.cc
similarity index 100%
rename from src/arch/infineon-tc1796-starter-kit/arch.cc
rename to src/arch/infineon-tc1796-mock/arch.cc
diff --git a/src/arch/infineon-tc1796-starter-kit/driver/counter.cc b/src/arch/infineon-tc1796-mock/driver/counter.cc
similarity index 100%
rename from src/arch/infineon-tc1796-starter-kit/driver/counter.cc
rename to src/arch/infineon-tc1796-mock/driver/counter.cc
diff --git a/src/arch/infineon-tc1796-starter-kit/driver/gpio.cc b/src/arch/infineon-tc1796-mock/driver/gpio.cc
similarity index 100%
rename from src/arch/infineon-tc1796-starter-kit/driver/gpio.cc
rename to src/arch/infineon-tc1796-mock/driver/gpio.cc
diff --git a/src/arch/infineon-tc1796-starter-kit/driver/stdout.cc b/src/arch/infineon-tc1796-mock/driver/stdout.cc
similarity index 100%
rename from src/arch/infineon-tc1796-starter-kit/driver/stdout.cc
rename to src/arch/infineon-tc1796-mock/driver/stdout.cc
diff --git a/src/arch/infineon-tc1796-mock/prompt b/src/arch/infineon-tc1796-mock/prompt
new file mode 100644
index 0000000000000000000000000000000000000000..19d4ab6017812aabbf8c8f3f5d0e1f63210b67b7
--- /dev/null
+++ b/src/arch/infineon-tc1796-mock/prompt
@@ -0,0 +1 @@
+Infineon TC1796 Mock (for Starter Kit)
diff --git a/src/arch/infineon-tc1796-starter-kit/prompt b/src/arch/infineon-tc1796-starter-kit/prompt
deleted file mode 100644
index f253a281e9d0228f683273bb36ff9cdce71a7697..0000000000000000000000000000000000000000
--- a/src/arch/infineon-tc1796-starter-kit/prompt
+++ /dev/null
@@ -1 +0,0 @@
-Infineon TC1796 Starter Kit
diff --git a/src/arch/infineon-tc397-tft-kit/Kconfig b/src/arch/infineon-tc397-mock/Kconfig
similarity index 100%
rename from src/arch/infineon-tc397-tft-kit/Kconfig
rename to src/arch/infineon-tc397-mock/Kconfig
diff --git a/src/arch/infineon-tc397-tft-kit/Makefile.inc b/src/arch/infineon-tc397-mock/Makefile.inc
similarity index 85%
rename from src/arch/infineon-tc397-tft-kit/Makefile.inc
rename to src/arch/infineon-tc397-mock/Makefile.inc
index 4917ef6758d43fa2b07aa5d9b09e9e14eedff549..dfa9972ee73f2e249ffcdfd7ee92a95660845111 100644
--- a/src/arch/infineon-tc397-tft-kit/Makefile.inc
+++ b/src/arch/infineon-tc397-mock/Makefile.inc
@@ -17,9 +17,9 @@ OBJCOPY = wine ${HOME}/.wine/drive_c/HighTec/toolchains/tricore/v4.9.3.0-infineo
 OBJDUMP = wine ${HOME}/.wine/drive_c/HighTec/toolchains/tricore/v4.9.3.0-infineon-1.0/bin/tricore-objdump.exe ${LICENSE}
 SIZE =    wine ${HOME}/.wine/drive_c/HighTec/toolchains/tricore/v4.9.3.0-infineon-1.0/bin/tricore-size.exe
 
-CXX_TARGETS += src/arch/infineon-tc397-tft-kit/arch.cc
-CXX_TARGETS += src/arch/infineon-tc397-tft-kit/driver/gpio.cc
-CXX_TARGETS += src/arch/infineon-tc397-tft-kit/driver/stdout.cc
+CXX_TARGETS += src/arch/infineon-tc397-mock/arch.cc
+CXX_TARGETS += src/arch/infineon-tc397-mock/driver/gpio.cc
+CXX_TARGETS += src/arch/infineon-tc397-mock/driver/stdout.cc
 
 ifneq (${cpu_freq}, )
 	COMMON_FLAGS += -DF_CPU=${cpu_freq}UL
@@ -28,11 +28,11 @@ else
 endif
 
 ifneq ($(findstring counter,${arch_drivers}), )
-	CONFIG_arch_infineon_tc397_tft_kit_driver_counter = y
+	CONFIG_arch_infineon_tc397_mock_driver_counter = y
 endif
 
-ifdef CONFIG_arch_infineon_tc397_tft_kit_driver_counter
-	CXX_TARGETS += src/arch/infineon-tc397-tft-kit/driver/counter.cc
+ifdef CONFIG_arch_infineon_tc397_mock_driver_counter
+	CXX_TARGETS += src/arch/infineon-tc397-mock/driver/counter.cc
 endif
 
 OBJECTS = ${CXX_TARGETS:.cc=.o} ${C_TARGETS:.c=.o} ${ASM_TARGETS:.S=.o}
diff --git a/src/arch/infineon-tc397-tft-kit/arch.cc b/src/arch/infineon-tc397-mock/arch.cc
similarity index 100%
rename from src/arch/infineon-tc397-tft-kit/arch.cc
rename to src/arch/infineon-tc397-mock/arch.cc
diff --git a/src/arch/infineon-tc397-tft-kit/driver/counter.cc b/src/arch/infineon-tc397-mock/driver/counter.cc
similarity index 100%
rename from src/arch/infineon-tc397-tft-kit/driver/counter.cc
rename to src/arch/infineon-tc397-mock/driver/counter.cc
diff --git a/src/arch/infineon-tc397-tft-kit/driver/gpio.cc b/src/arch/infineon-tc397-mock/driver/gpio.cc
similarity index 100%
rename from src/arch/infineon-tc397-tft-kit/driver/gpio.cc
rename to src/arch/infineon-tc397-mock/driver/gpio.cc
diff --git a/src/arch/infineon-tc397-tft-kit/driver/stdout.cc b/src/arch/infineon-tc397-mock/driver/stdout.cc
similarity index 100%
rename from src/arch/infineon-tc397-tft-kit/driver/stdout.cc
rename to src/arch/infineon-tc397-mock/driver/stdout.cc
diff --git a/src/arch/infineon-tc397-mock/prompt b/src/arch/infineon-tc397-mock/prompt
new file mode 100644
index 0000000000000000000000000000000000000000..8c9984eb0dbc8dc319886f583f082fa26f85522c
--- /dev/null
+++ b/src/arch/infineon-tc397-mock/prompt
@@ -0,0 +1 @@
+Infineon TC397 Mock (for A2G TC397 3V3 TFT Kit)
diff --git a/src/arch/infineon-tc397-tft-kit/prompt b/src/arch/infineon-tc397-tft-kit/prompt
deleted file mode 100644
index 33138858fd8bab5a3a64ecb2d271bbcef9bf44d7..0000000000000000000000000000000000000000
--- a/src/arch/infineon-tc397-tft-kit/prompt
+++ /dev/null
@@ -1 +0,0 @@
-Infineon A2G TC397 3V3 TFT Kit