diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile
index 829afc75ee3..533c4cdf624 100644
--- a/arch/sim/src/Makefile
+++ b/arch/sim/src/Makefile
@@ -41,12 +41,12 @@ REQUIREDOBJS = $(LINKOBJS)
 
 ifeq ($(CONFIG_HOST_X86_64),y)
 ifeq ($(CONFIG_SIM_M32),y)
-  ASRCS += up_vfork32.S
+  ASRCS += up_vfork_x86.S
 else
-  ASRCS += up_vfork64.S
+  ASRCS += up_vfork_x86_64.S
 endif
 else ifeq ($(CONFIG_HOST_X86),y)
-  ASRCS += up_vfork32.S
+  ASRCS += up_vfork_x86.S
 else ifeq ($(CONFIG_HOST_ARM),y)
   ASRCS += up_vfork_arm.S
 endif
diff --git a/arch/sim/src/sim/up_vfork32.S b/arch/sim/src/sim/up_vfork_x86.S
similarity index 99%
rename from arch/sim/src/sim/up_vfork32.S
rename to arch/sim/src/sim/up_vfork_x86.S
index 223a0233b89..fc152c20649 100644
--- a/arch/sim/src/sim/up_vfork32.S
+++ b/arch/sim/src/sim/up_vfork_x86.S
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/sim/src/sim/up_vfork32.S
+ * arch/sim/src/sim/up_vfork_x86.S
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/arch/sim/src/sim/up_vfork64.S b/arch/sim/src/sim/up_vfork_x86_64.S
similarity index 99%
rename from arch/sim/src/sim/up_vfork64.S
rename to arch/sim/src/sim/up_vfork_x86_64.S
index 48da703f539..527678c5119 100644
--- a/arch/sim/src/sim/up_vfork64.S
+++ b/arch/sim/src/sim/up_vfork_x86_64.S
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/sim/src/sim/up_vfork64.S
+ * arch/sim/src/sim/up_vfork_x86_64.S
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with