diff --git a/toolchain.inc b/toolchain.inc
index dca00fc6e3..f666e0cc52 100644
--- a/toolchain.inc
+++ b/toolchain.inc
@@ -81,9 +81,6 @@ init_standard_toolchain = \
 init_stages = \
 	    $(foreach stage,$(COREBOOT_STANDARD_STAGES),$(eval $(call init_standard_toolchain,$(stage))))
 
-# This mapping is created to have consistency with xcompile naming
-$(eval $(call create_class_compiler,x86_32,i386))
-
 $(eval $(call toolchain_to_dir))
 
 $(call init_stages)
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index 0ac2bec942..b342de308f 100644
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -181,7 +181,7 @@ arch_config_aarch64() {
 }
 
 arch_config_x86() {
-	TARCH="i386"
+	TARCH="x86_32"
 	TBFDARCH="i386"
 	TCLIST="i386 x86_64"
 	TWIDTH="32"