diff --git a/.gitmodules b/.gitmodules
index accc068541e09f99a360553a68889aed3c7674b3..492260b8888bf89ba067cdc479e419b7d4dc0c34 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,21 +1,21 @@
 [submodule "accelerator-wrapper"]
 	path = accelerator_wrapper_tech
-url = https://git.soton.ac.uk:soclabs/accelerator-wrapper.git
+url = https://git.soton.ac.uk:soclabs/accelerator_wrapper_tech.git
 [submodule "nanosoc"]
 	path = nanosoc_tech
-url = https://git.soton.ac.uk:soclabs/nanosoc.git
+url = https://git.soton.ac.uk:soclabs/nanosoc_tech.git
 [submodule "socsim"]
 	path = socsim_flow
-url = https://git.soton.ac.uk:soclabs/socsim.git
+url = https://git.soton.ac.uk:soclabs/socsim_flow.git
 [submodule "CHIPKIT"]
 	path = chipkit_flow
-url = https://git.soton.ac.uk:soclabs/CHIPKIT.git
+url = https://git.soton.ac.uk:soclabs/chipkit_flow.git
 [submodule "generic-lib"]
 	path = generic_lib_tech
-	url = https://git.soton.ac.uk:soclabs/generic-lib.git
+	url = https://git.soton.ac.uk:soclabs/generic_lib_tech.git
 [submodule "fpga-lib"]
 	path = fpga_lib_tech
-	url = https://git.soton.ac.uk:soclabs/fpga-lib.git
+	url = https://git.soton.ac.uk:soclabs/fpga_lib_tech.git
 [submodule "rtl_primitives_tech"]
 	path = rtl_primitives_tech
 	url = https://git.soton.ac.uk:soclabs/rtl_primitives_tech.git
diff --git a/nanosoc_tech b/nanosoc_tech
index f7f61d86f69185976c708a0558bfdad4a7f0af89..9e4a4da0a9dd45c84a787c4cf73294e7a412aff4 160000
--- a/nanosoc_tech
+++ b/nanosoc_tech
@@ -1 +1 @@
-Subproject commit f7f61d86f69185976c708a0558bfdad4a7f0af89
+Subproject commit 9e4a4da0a9dd45c84a787c4cf73294e7a412aff4