diff --git a/.gitmodules b/.gitmodules
index 161d102a0ee95d5aeb6c39dacda8b39805887f9d..d883fa3bbde6877afccd7884279282734cf7aeac 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,10 +5,10 @@ url = git@git.soton.ac.uk:soclabs/accelerator-wrapper.git
 	path = nanosoc_tech
 url = git@git.soton.ac.uk:soclabs/nanosoc.git
 [submodule "socsim"]
-path = socsim
+	path = socsim_flow
 url = git@git.soton.ac.uk:soclabs/socsim.git
 [submodule "CHIPKIT"]
-	path = chipkit
+	path = chipkit_flow
 url = git@git.soton.ac.uk:soclabs/CHIPKIT.git
 [submodule "secworks-sha256"]
 	path = secworks-sha256
@@ -19,3 +19,6 @@ url = git@git.soton.ac.uk:soclabs/CHIPKIT.git
 [submodule "fpga-lib"]
 	path = fpga_lib_tech
 	url = git@git.soton.ac.uk:soclabs/fpga-lib.git
+[submodule "vanillaflow"]
+	path = vanillaflow_flow
+	url = git@git.soton.ac.uk:soclabs/vanillaflow.git
diff --git a/chipkit b/chipkit_flow
similarity index 100%
rename from chipkit
rename to chipkit_flow
diff --git a/env/dependency_env.sh b/env/dependency_env.sh
index d063cc5d95f894fa2eb7778d16748a43033d4932..edff88561cf965848cf4d22f53e2e2a7bb706117 100755
--- a/env/dependency_env.sh
+++ b/env/dependency_env.sh
@@ -34,7 +34,7 @@ export GENERIC_LIB_TECH_DIR="$PROJECT_DIR/generic_lib_tech"
 #-----------------------------------------------------------------------------
 
 # CHIPKIT - Register Generation
-export CHIPKIT_FLOW_DIR="$PROJECT_DIR/chipkit"
+export CHIPKIT_FLOW_DIR="$PROJECT_DIR/chipkit_flow"
 
 # SoCSim - Basic Simulation Flow Wrapper
-export SOCSIM_FLOW_DIR="$PROJECT_DIR/socsim"
\ No newline at end of file
+export SOCSIM_FLOW_DIR="$PROJECT_DIR/socsim_flow"
\ No newline at end of file
diff --git a/nanosoc_tech b/nanosoc_tech
index cb75144cc56c13ec4e4ea672d4e38ba3552001fa..c04ad57b008e85421dcb4a0a69b54a54e386c3a7 160000
--- a/nanosoc_tech
+++ b/nanosoc_tech
@@ -1 +1 @@
-Subproject commit cb75144cc56c13ec4e4ea672d4e38ba3552001fa
+Subproject commit c04ad57b008e85421dcb4a0a69b54a54e386c3a7
diff --git a/proj-branch b/proj-branch
index 901f523d907083ef4e57006b0e636a714810a916..ace36e007ab6bd4b9b4ac316264a18d1a66ef6ef 100644
--- a/proj-branch
+++ b/proj-branch
@@ -10,10 +10,10 @@
 #-----------------------------------------------------------------------------
 # Each Repo needs to have its branch set manually in here - they will defaultly be checked out to main
 # Project Repository Subrepository Branch Index
-nanosoc: feat_accel_decouple
-CHIPKIT: main
-accelerator-wrapper: main
-fpga-lib: main
-generic-lib: main
+nanosoc_tech: feat_accel_decouple
+chipkit_flow: main
+accelerator_wrapper_tech: main
+fpga_lib_tech: main
+generic_lib_tech: main
 secworks-sha256: main
-socsim: main
\ No newline at end of file
+socsim_flow: main
\ No newline at end of file
diff --git a/socsim b/socsim_flow
similarity index 100%
rename from socsim
rename to socsim_flow