diff --git a/firmware/config/boards/subaru-ej20gn/board.mk b/firmware/config/boards/subaru-ej20gn/board.mk
index f1f6e9897c..3d009ed59e 100644
--- a/firmware/config/boards/subaru-ej20gn/board.mk
+++ b/firmware/config/boards/subaru-ej20gn/board.mk
@@ -1,17 +1,17 @@
 # List of all the board related files.
-BOARDSRC = $(PROJECT_DIR)/config/boards/subaruej20g/board.c
-BOARDSRC_CPP = $(PROJECT_DIR)/config/boards/subaruej20g/board_configuration.cpp
+BOARDSRC = $(PROJECT_DIR)/config/boards/subaru-ej20gn/board.c
+BOARDSRC_CPP = $(PROJECT_DIR)/config/boards/subaru-ej20gn/board_configuration.cpp
 
 # Required include directories
-BOARDINC = $(PROJECT_DIR)/config/boards/subaruej20g
+BOARDINC = $(PROJECT_DIR)/config/boards/subaru-ej20gn
 
 # Override LD script
 ifeq ($(USE_BOOTLOADER),yes)
   # include Prometheus bootloader code
-  BOOTLOADERINC= $(PROJECT_DIR)/bootloader/subaruej20g
+  BOOTLOADERINC= $(PROJECT_DIR)/bootloader/subaru-ej20gn
 endif
 
-LDSCRIPT= $(PROJECT_DIR)/config/boards/subaruej20g/STM32F76xxI.ld
+LDSCRIPT= $(PROJECT_DIR)/config/boards/subaru-ej20gn/STM32F76xxI.ld
 
 # Override DEFAULT_ENGINE_TYPE
 DDEFS += -DDEFAULT_ENGINE_TYPE=SUBARUEJ20G_DEFAULTS -DSTM32F765xx
diff --git a/firmware/config/boards/subaru-ej20gn/board_configuration.cpp b/firmware/config/boards/subaru-ej20gn/board_configuration.cpp
index 6bd89b1bd8..f5353c4cdd 100644
--- a/firmware/config/boards/subaru-ej20gn/board_configuration.cpp
+++ b/firmware/config/boards/subaru-ej20gn/board_configuration.cpp
@@ -133,7 +133,6 @@ void setBoardConfigurationOverrides(void) {
 	engineConfiguration->runningLedPin = GPIO_UNASSIGNED;
 	engineConfiguration->warninigLedPin = GPIOG_8; 	/* LD3 - yellow*/
 	engineConfiguration->fatalErrorPin = LED_ERROR_BRAIN_PIN;	/* LD1 - red */
-	engineConfiguration->configResetPin = GPIO_UNASSIGNED;
 
 	/* IF you have BOTH camshaft position sensor and crankshaft position sensor
 	 * camshaft is always trigger#1 input and then crankshaft is trigger#2. */
diff --git a/firmware/config/boards/subaru-ej20gn/make.sh b/firmware/config/boards/subaru-ej20gn/make.sh
index e946b17250..add57a5ab5 100755
--- a/firmware/config/boards/subaru-ej20gn/make.sh
+++ b/firmware/config/boards/subaru-ej20gn/make.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export PROJECT_BOARD=subaruej20g
+export PROJECT_BOARD=subaru-ej20gn
 export PROJECT_CPU=ARCH_STM32F7
 export PROJECT_CORE=cortex-m7
 export EXTRA_PARAMS="-DDUMMY -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_TRACE=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE"