diff --git a/.gitmodules b/.gitmodules
index 1836fde39280311645382663551f6ed2da06fcec..161d102a0ee95d5aeb6c39dacda8b39805887f9d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,21 +1,21 @@
 [submodule "accelerator-wrapper"]
-path = accelerator-wrapper
+	path = accelerator_wrapper_tech
 url = git@git.soton.ac.uk:soclabs/accelerator-wrapper.git
 [submodule "nanosoc"]
-path = nanosoc
+	path = nanosoc_tech
 url = git@git.soton.ac.uk:soclabs/nanosoc.git
 [submodule "socsim"]
 path = socsim
 url = git@git.soton.ac.uk:soclabs/socsim.git
 [submodule "CHIPKIT"]
-path = CHIPKIT
+	path = chipkit
 url = git@git.soton.ac.uk:soclabs/CHIPKIT.git
 [submodule "secworks-sha256"]
 	path = secworks-sha256
 	url = git@git.soton.ac.uk:soclabs/secworks-sha256.git
 [submodule "generic-lib"]
-	path = generic-lib
+	path = generic_lib_tech
 	url = git@git.soton.ac.uk:soclabs/generic-lib.git
 [submodule "fpga-lib"]
-	path = fpga-lib
+	path = fpga_lib_tech
 	url = git@git.soton.ac.uk:soclabs/fpga-lib.git
diff --git a/accelerator-wrapper b/accelerator_wrapper_tech
similarity index 100%
rename from accelerator-wrapper
rename to accelerator_wrapper_tech
diff --git a/CHIPKIT b/chipkit
similarity index 100%
rename from CHIPKIT
rename to chipkit
diff --git a/fpga-lib b/fpga_lib_tech
similarity index 100%
rename from fpga-lib
rename to fpga_lib_tech
diff --git a/generic-lib b/generic_lib_tech
similarity index 100%
rename from generic-lib
rename to generic_lib_tech
diff --git a/nanosoc b/nanosoc
deleted file mode 160000
index bfd0e82ea7ca8b417e1c9cfa53a1316aad09ff1a..0000000000000000000000000000000000000000
--- a/nanosoc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bfd0e82ea7ca8b417e1c9cfa53a1316aad09ff1a
diff --git a/nanosoc_tech b/nanosoc_tech
new file mode 160000
index 0000000000000000000000000000000000000000..cb75144cc56c13ec4e4ea672d4e38ba3552001fa
--- /dev/null
+++ b/nanosoc_tech
@@ -0,0 +1 @@
+Subproject commit cb75144cc56c13ec4e4ea672d4e38ba3552001fa