diff --git a/.gitmodules b/.gitmodules
index 507aa91640b52098c1779ecf6b8b91c2cccbc381..f08e7c37228092a9c06611fe186f7b0bbf66adf5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,19 +1,19 @@
-[submodule "accelerator-wrapper"]
+[submodule "accelerator_wrapper_tech"]
 	path = accelerator_wrapper_tech
 url = https://git.soton.ac.uk/soclabs/accelerator_wrapper_tech.git
-[submodule "nanosoc"]
+[submodule "nanosoc_tech"]
 	path = nanosoc_tech
 url = https://git.soton.ac.uk/soclabs/nanosoc_tech.git
-[submodule "socsim"]
+[submodule "socsim_flow"]
 	path = socsim_flow
 url = https://git.soton.ac.uk/soclabs/socsim_flow.git
-[submodule "CHIPKIT"]
+[submodule "chipkit_flow"]
 	path = chipkit_flow
 url = https://git.soton.ac.uk/soclabs/chipkit_flow.git
-[submodule "generic-lib"]
+[submodule "generic_lib_tech"]
 	path = generic_lib_tech
 	url = https://git.soton.ac.uk/soclabs/generic_lib_tech.git
-[submodule "fpga-lib"]
+[submodule "fpga_lib_tech"]
 	path = fpga_lib_tech
 	url = https://git.soton.ac.uk/soclabs/fpga_lib_tech.git
 [submodule "rtl_primitives_tech"]