diff --git a/boards/arm/stm32/stm32f4discovery/configs/shiftgame/defconfig b/boards/arm/stm32/stm32f4discovery/configs/brickmatch/defconfig
similarity index 98%
rename from boards/arm/stm32/stm32f4discovery/configs/shiftgame/defconfig
rename to boards/arm/stm32/stm32f4discovery/configs/brickmatch/defconfig
index 6dce163f49..214ab3189c 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/shiftgame/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/brickmatch/defconfig
@@ -28,7 +28,7 @@ CONFIG_EXAMPLES_FB_STACKSIZE=16000
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_FS_LARGEFILE=y
 CONFIG_FS_PROCFS=y
-CONFIG_GAMES_SHIFT=y
+CONFIG_GAMES_BRICKMATCH=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INIT_ENTRYPOINT="nsh_main"
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit-rust-1/configs/shiftgame/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit-rust-1/configs/brickmatch/defconfig
similarity index 98%
rename from boards/risc-v/esp32c3/esp32c3-devkit-rust-1/configs/shiftgame/defconfig
rename to boards/risc-v/esp32c3/esp32c3-devkit-rust-1/configs/brickmatch/defconfig
index f07f6c0625..f4f86c45d1 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit-rust-1/configs/shiftgame/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-devkit-rust-1/configs/brickmatch/defconfig
@@ -40,7 +40,7 @@ CONFIG_ESP32C3_SPI2_MOSIPIN=5
 CONFIG_ESP32C3_USBSERIAL=y
 CONFIG_EXAMPLES_FB=y
 CONFIG_FS_PROCFS=y
-CONFIG_GAMES_SHIFT=y
+CONFIG_GAMES_BRICKMATCH=y
 CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INIT_ENTRYPOINT="nsh_main"
 CONFIG_INTELHEX_BINARY=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/brickmatch/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/brickmatch/defconfig
index f964842f05..4c28e14bd1 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/brickmatch/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/brickmatch/defconfig
@@ -17,6 +17,7 @@ CONFIG_ARCH_CHIP_ESP32=y
 CONFIG_ARCH_CHIP_ESP32WROVER=y
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARCH_XTENSA=y
+CONFIG_BOARD_LATE_INITIALIZE=y
 CONFIG_BOARD_LOOPSPERMSEC=16717
 CONFIG_BUILTIN=y
 CONFIG_DRIVERS_VIDEO=y
@@ -26,11 +27,11 @@ CONFIG_ESP32_UART0=y
 CONFIG_EXAMPLES_APDS9960=y
 CONFIG_EXAMPLES_FB=y
 CONFIG_FS_PROCFS=y
-CONFIG_GAMES_SHIFT=y
+CONFIG_GAMES_BRICKMATCH=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_IDLETHREAD_STACKSIZE=3072
-CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_ENTRYPOINT="brick_main"
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LCD=y
 CONFIG_LCD_APA102=y