diff --git a/arch/arm/src/common/CMakeLists.txt b/arch/arm/src/common/CMakeLists.txt
index 609b1a82d6..ac630ec46b 100644
--- a/arch/arm/src/common/CMakeLists.txt
+++ b/arch/arm/src/common/CMakeLists.txt
@@ -40,8 +40,8 @@ set(SRCS
     arm_stackframe.c
     arm_switchcontext.c
     arm_usestack.c
-    arm_vfork.c
-    ${ARCH_TOOLCHAIN_PATH}/vfork.S)
+    arm_fork.c
+    ${ARCH_TOOLCHAIN_PATH}/fork.S)
 
 if(NOT CONFIG_ALARM_ARCH AND NOT CONFIG_TIMER_ARCH)
   list(APPEND SRCS arm_mdelay.c arm_udelay.c)
diff --git a/arch/sim/src/sim/CMakeLists.txt b/arch/sim/src/sim/CMakeLists.txt
index 52427a0140..989e11fa2c 100644
--- a/arch/sim/src/sim/CMakeLists.txt
+++ b/arch/sim/src/sim/CMakeLists.txt
@@ -55,24 +55,24 @@ list(
 
 if(CONFIG_HOST_X86_64)
   if(CONFIG_SIM_M32)
-    list(APPEND SRCS sim_vfork_x86.S)
+    list(APPEND SRCS sim_fork_x86.S)
   else()
-    list(APPEND SRCS sim_vfork_x86_64.S)
+    list(APPEND SRCS sim_fork_x86_64.S)
   endif()
 elseif(CONFIG_HOST_X86)
-  list(APPEND SRCS sim_vfork_x86.S)
+  list(APPEND SRCS sim_fork_x86.S)
 elseif(CONFIG_HOST_ARM)
-  list(APPEND SRCS sim_vfork_arm.S)
+  list(APPEND SRCS sim_fork_arm.S)
 elseif(CONFIG_HOST_ARM64)
-  list(APPEND SRCS sim_vfork_arm64.S)
+  list(APPEND SRCS sim_fork_arm64.S)
 endif()
 
 if(CONFIG_SCHED_BACKTRACE)
   list(APPEND SRCS sim_backtrace.c)
 endif()
 
-if(CONFIG_ARCH_HAVE_VFORK AND CONFIG_SCHED_WAITPID)
-  list(APPEND SRCS sim_vfork.c)
+if(CONFIG_ARCH_HAVE_FORK AND CONFIG_SCHED_WAITPID)
+  list(APPEND SRCS sim_fork.c)
 endif()
 
 if(CONFIG_ONESHOT)
diff --git a/sched/task/CMakeLists.txt b/sched/task/CMakeLists.txt
index 092197f29a..6453fda69f 100644
--- a/sched/task/CMakeLists.txt
+++ b/sched/task/CMakeLists.txt
@@ -48,9 +48,9 @@ if(CONFIG_SCHED_HAVE_PARENT)
   list(APPEND SRCS task_getppid.c task_reparent.c)
 endif()
 
-if(CONFIG_ARCH_HAVE_VFORK)
+if(CONFIG_ARCH_HAVE_FORK)
   if(CONFIG_SCHED_WAITPID)
-    list(APPEND SRCS task_vfork.c)
+    list(APPEND SRCS task_fork.c)
   endif()
 endif()