diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
index ae209fd..700a2f8 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
@@ -5,8 +5,8 @@
 MACHINEOVERRIDES =. "${@['', '${BOARD}${BOARD_VARIANT}:']['${BOARD_VARIANT}' != '']}"
 
 
-SOC_BOARD_ARCH ?= "${BOARD}"
-SOC_BOARDVARIANT_ARCH ?= "${BOARD}${BOARD_VARIANT}"
+BOARD_ARCH ?= "${BOARD}"
+BOARDVARIANT_ARCH ?= "${BOARD}${BOARD_VARIANT}"
 
-PACKAGE_EXTRA_ARCHS_append = " ${SOC_BOARD_ARCH}"
-PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${SOC_BOARDVARIANT_ARCH}'][d.getVar('SOC_BOARDVARIANT_ARCH') != d.getVar('SOC_BOARD_ARCH')]}"
+PACKAGE_EXTRA_ARCHS_append = " ${BOARD_ARCH}"
+PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${BOARDVARIANT_ARCH}'][d.getVar('BOARDVARIANT_ARCH') != d.getVar('BOARD_ARCH')]}"