diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile
index 92efd73..2b9bbcb 100644
--- a/payloads/libpayload/Makefile
+++ b/payloads/libpayload/Makefile
@@ -110,12 +110,12 @@
 
 ARCH-y := $(ARCHDIR-y)
 
-# If architecture folder name is different from GCC binutils architecture name,
+# If architecture folder name is different from xcompile architecture name,
 # override here.
 ARCH-$(CONFIG_LP_ARCH_ARM)     := arm
 ARCH-$(CONFIG_LP_ARCH_ARM64)   := arm64
-ARCH-$(CONFIG_LP_ARCH_X86)     := i386
-ARCH-$(CONFIG_LP_ARCH_MIPS)    := mipsel
+ARCH-$(CONFIG_LP_ARCH_X86)     := x86_32
+ARCH-$(CONFIG_LP_ARCH_MIPS)    := mips
 
 CC := $(CC_$(ARCH-y))
 AS := $(AS_$(ARCH-y))