diff --git a/base-codezero/lib/mk/base.mk b/base-codezero/lib/mk/base.mk
index a63bf952e..1cd54b3fc 100644
--- a/base-codezero/lib/mk/base.mk
+++ b/base-codezero/lib/mk/base.mk
@@ -1,5 +1,5 @@
 SRC_CC += console/log_console.cc
-SRC_CC += env/env.cc env/context_area.cc env/reload_parent_cap.cc
+SRC_CC += env/env.cc env/context_area.cc env/reinitialize.cc
 SRC_CC += thread/thread_start.cc
 
 INC_DIR += $(BASE_DIR)/src/base/env
diff --git a/base-fiasco/lib/mk/base.mk b/base-fiasco/lib/mk/base.mk
index 2a2262239..c364cd313 100644
--- a/base-fiasco/lib/mk/base.mk
+++ b/base-fiasco/lib/mk/base.mk
@@ -7,7 +7,7 @@
 LIBS += base-common
 
 SRC_CC += console/log_console.cc
-SRC_CC += env/env.cc env/context_area.cc env/reload_parent_cap.cc
+SRC_CC += env/env.cc env/context_area.cc env/reinitialize.cc
 SRC_CC += thread/thread_start.cc
 
 INC_DIR += $(BASE_DIR)/src/base/env
diff --git a/base-foc/lib/mk/base.mk b/base-foc/lib/mk/base.mk
index 8f0a09bb4..93c6c060d 100644
--- a/base-foc/lib/mk/base.mk
+++ b/base-foc/lib/mk/base.mk
@@ -7,7 +7,7 @@
 LIBS += base-common
 
 SRC_CC += console/log_console.cc
-SRC_CC += env/env.cc env/context_area.cc env/reload_parent_cap.cc \
+SRC_CC += env/env.cc env/context_area.cc env/reinitialize.cc \
           env/cap_map_remove.cc env/cap_alloc.cc
 SRC_CC += thread/thread_start.cc
 
diff --git a/base-hw/lib/mk/base.mk b/base-hw/lib/mk/base.mk
index a5b257a30..45094c478 100644
--- a/base-hw/lib/mk/base.mk
+++ b/base-hw/lib/mk/base.mk
@@ -7,7 +7,7 @@
 LIBS += base-common startup
 
 SRC_CC += console/log_console.cc
-SRC_CC += env/env.cc env/context_area.cc env/reload_parent_cap.cc
+SRC_CC += env/env.cc env/context_area.cc env/reinitialize.cc
 SRC_CC += thread/thread.cc thread_support.cc
 
 INC_DIR += $(BASE_DIR)/src/base/env
diff --git a/base-nova/lib/mk/base.mk b/base-nova/lib/mk/base.mk
index dc8336c48..97c8cc911 100644
--- a/base-nova/lib/mk/base.mk
+++ b/base-nova/lib/mk/base.mk
@@ -8,7 +8,7 @@ LIBS += base-common
 
 SRC_CC += console/log_console.cc
 SRC_CC += env/env.cc env/main_thread.cc \
-          env/context_area.cc env/reload_parent_cap
+          env/context_area.cc env/reinitialize.cc
 SRC_CC += thread/thread_nova.cc
 
 INC_DIR += $(BASE_DIR)/src/base/env
diff --git a/base-okl4/lib/mk/base.mk b/base-okl4/lib/mk/base.mk
index 71972c81b..2adc078d4 100644
--- a/base-okl4/lib/mk/base.mk
+++ b/base-okl4/lib/mk/base.mk
@@ -1,5 +1,5 @@
 SRC_CC += console/log_console.cc
-SRC_CC += env/env.cc env/context_area.cc env/reload_parent_cap.cc
+SRC_CC += env/env.cc env/context_area.cc env/reinitialize.cc
 SRC_CC += thread/thread_start.cc
 
 vpath %.cc  $(REP_DIR)/src/base
diff --git a/base-pistachio/lib/mk/base.mk b/base-pistachio/lib/mk/base.mk
index 2a2262239..c364cd313 100644
--- a/base-pistachio/lib/mk/base.mk
+++ b/base-pistachio/lib/mk/base.mk
@@ -7,7 +7,7 @@
 LIBS += base-common
 
 SRC_CC += console/log_console.cc
-SRC_CC += env/env.cc env/context_area.cc env/reload_parent_cap.cc
+SRC_CC += env/env.cc env/context_area.cc env/reinitialize.cc
 SRC_CC += thread/thread_start.cc
 
 INC_DIR += $(BASE_DIR)/src/base/env
diff --git a/base/src/base/env/reload_parent_cap.cc b/base/src/base/env/reinitialize.cc
similarity index 100%
rename from base/src/base/env/reload_parent_cap.cc
rename to base/src/base/env/reinitialize.cc