diff --git a/src/mainboard/amd/onyx/Kconfig.name b/src/mainboard/amd/onyx/Kconfig.name
deleted file mode 100644
index 0dc99a735b..0000000000
--- a/src/mainboard/amd/onyx/Kconfig.name
+++ /dev/null
@@ -1,2 +0,0 @@
-config BOARD_AMD_ONYX
-	bool "Onyx"
diff --git a/src/mainboard/amd/onyx/Kconfig b/src/mainboard/amd/onyx_poc/Kconfig
similarity index 71%
rename from src/mainboard/amd/onyx/Kconfig
rename to src/mainboard/amd/onyx_poc/Kconfig
index 7224a9b662..bac8ec80a8 100644
--- a/src/mainboard/amd/onyx/Kconfig
+++ b/src/mainboard/amd/onyx_poc/Kconfig
@@ -1,4 +1,4 @@
-if BOARD_AMD_ONYX
+if BOARD_AMD_ONYX_POC
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
@@ -7,14 +7,14 @@ config BOARD_SPECIFIC_OPTIONS
 	select AMD_SOC_CONSOLE_UART
 
 config FMDFILE
-	default "src/mainboard/amd/onyx/board.fmd"
+	default "src/mainboard/amd/onyx_poc/board.fmd"
 
 
 config MAINBOARD_DIR
-	default "amd/onyx"
+	default "amd/onyx_poc"
 
 config MAINBOARD_PART_NUMBER
-	default "Onyx"
+	default "Onyx_poc"
 
 # Use BMC SOL console on SoC UART1 by default
 config UART_FOR_CONSOLE
diff --git a/src/mainboard/amd/onyx_poc/Kconfig.name b/src/mainboard/amd/onyx_poc/Kconfig.name
new file mode 100644
index 0000000000..a896f83696
--- /dev/null
+++ b/src/mainboard/amd/onyx_poc/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_ONYX_POC
+	bool "Onyx_poc"
diff --git a/src/mainboard/amd/onyx/Makefile.inc b/src/mainboard/amd/onyx_poc/Makefile.inc
similarity index 100%
rename from src/mainboard/amd/onyx/Makefile.inc
rename to src/mainboard/amd/onyx_poc/Makefile.inc
diff --git a/src/mainboard/amd/onyx/board.fmd b/src/mainboard/amd/onyx_poc/board.fmd
similarity index 100%
rename from src/mainboard/amd/onyx/board.fmd
rename to src/mainboard/amd/onyx_poc/board.fmd
diff --git a/src/mainboard/amd/onyx/board_info.txt b/src/mainboard/amd/onyx_poc/board_info.txt
similarity index 100%
rename from src/mainboard/amd/onyx/board_info.txt
rename to src/mainboard/amd/onyx_poc/board_info.txt
diff --git a/src/mainboard/amd/onyx/devicetree.cb b/src/mainboard/amd/onyx_poc/devicetree.cb
similarity index 100%
rename from src/mainboard/amd/onyx/devicetree.cb
rename to src/mainboard/amd/onyx_poc/devicetree.cb
diff --git a/src/mainboard/amd/onyx/dsdt.asl b/src/mainboard/amd/onyx_poc/dsdt.asl
similarity index 100%
rename from src/mainboard/amd/onyx/dsdt.asl
rename to src/mainboard/amd/onyx_poc/dsdt.asl
diff --git a/src/mainboard/amd/onyx/mainboard.c b/src/mainboard/amd/onyx_poc/mainboard.c
similarity index 100%
rename from src/mainboard/amd/onyx/mainboard.c
rename to src/mainboard/amd/onyx_poc/mainboard.c