diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile
index bb95b6480646..b8a98fc1dd47 100644
--- a/stand/efi/loader/Makefile
+++ b/stand/efi/loader/Makefile
@@ -117,7 +117,7 @@ ${LOADER}.efi: ${PROG}
 	${OBJCOPY} -j .peheader -j .text -j .sdata -j .data \
 		-j .dynamic -j .dynsym -j .rel.dyn \
 		-j .rela.dyn -j .reloc -j .eh_frame -j set_Xcommand_set \
-		-j set_Xficl_compile_set -j set_Xlua_compile_set \
+		-j set_X4th_compile_set -j set_Xlua_compile_set \
 		--output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET}
 
 LIBEFI=		${BOOTOBJ}/efi/libefi/libefi.a
diff --git a/stand/ficl/ficl.h b/stand/ficl/ficl.h
index bdade26eee09..7be78f1a36b8 100644
--- a/stand/ficl/ficl.h
+++ b/stand/ficl/ficl.h
@@ -1153,8 +1153,8 @@ typedef struct ficlFILE
 
 typedef void ficlCompileFcn(FICL_SYSTEM *);
 #define FICL_COMPILE_SET(func)	\
-	DATA_SET(Xficl_compile_set, func)
-SET_DECLARE(Xficl_compile_set, ficlCompileFcn);
+	DATA_SET(X4th_compile_set, func)
+SET_DECLARE(X4th_compile_set, ficlCompileFcn);
 
 #ifdef LOADER_VERIEXEC
 #include <verify_file.h>
diff --git a/stand/ficl/loader.c b/stand/ficl/loader.c
index 618d9483fbd9..69a65ebedb73 100644
--- a/stand/ficl/loader.c
+++ b/stand/ficl/loader.c
@@ -865,7 +865,7 @@ void ficlCompilePlatform(FICL_SYSTEM *pSys)
     dictAppendWord(dp, "uuid-from-string", ficlUuidFromString, FW_DEFAULT);
     dictAppendWord(dp, "uuid-to-string", ficlUuidToString, FW_DEFAULT);
     
-    SET_FOREACH(fnpp, Xficl_compile_set)
+    SET_FOREACH(fnpp, X4th_compile_set)
 	(*fnpp)(pSys);
 
 #if defined(__i386__)