diff --git a/.gitmodules b/.gitmodules
index 566c7f20..a134d4f1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "habitat_extensions"]
-	path = habitat_extensions
-	url = git://github.com/ukhas/habitat_extensions.git
+[submodule "habitat-cpp-connector"]
+	path = habitat-cpp-connector
+	url = git://github.com/ukhas/habitat-cpp-connector
diff --git a/habitat-cpp-connector b/habitat-cpp-connector
new file mode 160000
index 00000000..b18975e4
--- /dev/null
+++ b/habitat-cpp-connector
@@ -0,0 +1 @@
+Subproject commit b18975e4c4286e810feeac5a7af22c4533eac50e
diff --git a/habitat_extensions b/habitat_extensions
deleted file mode 160000
index 7d19e828..00000000
--- a/habitat_extensions
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7d19e828e2efb68f6ca5d4395d92c32d6a5e794f
diff --git a/src/habitat b/src/habitat
index 072c20ec..3ed726d6 120000
--- a/src/habitat
+++ b/src/habitat
@@ -1 +1 @@
-../habitat_extensions/cpp_connector/src/
\ No newline at end of file
+../habitat-cpp-connector/src/
\ No newline at end of file
diff --git a/src/include/habitat/CouchDB.h b/src/include/habitat/CouchDB.h
index 6ee132e9..75d76b7b 120000
--- a/src/include/habitat/CouchDB.h
+++ b/src/include/habitat/CouchDB.h
@@ -1 +1 @@
-../../../habitat_extensions/cpp_connector/src/CouchDB.h
\ No newline at end of file
+../../../habitat-cpp-connector/src/CouchDB.h
\ No newline at end of file
diff --git a/src/include/habitat/EZ.h b/src/include/habitat/EZ.h
index c77b06bb..63ace10c 120000
--- a/src/include/habitat/EZ.h
+++ b/src/include/habitat/EZ.h
@@ -1 +1 @@
-../../../habitat_extensions/cpp_connector/src/EZ.h
\ No newline at end of file
+../../../habitat-cpp-connector/src/EZ.h
\ No newline at end of file
diff --git a/src/include/habitat/Extractor.h b/src/include/habitat/Extractor.h
index 66790599..9383eafc 120000
--- a/src/include/habitat/Extractor.h
+++ b/src/include/habitat/Extractor.h
@@ -1 +1 @@
-../../../habitat_extensions/cpp_connector/src/Extractor.h
\ No newline at end of file
+../../../habitat-cpp-connector/src/Extractor.h
\ No newline at end of file
diff --git a/src/include/habitat/UKHASExtractor.h b/src/include/habitat/UKHASExtractor.h
index 5d0524bd..525e766a 120000
--- a/src/include/habitat/UKHASExtractor.h
+++ b/src/include/habitat/UKHASExtractor.h
@@ -1 +1 @@
-../../../habitat_extensions/cpp_connector/src/UKHASExtractor.h
\ No newline at end of file
+../../../habitat-cpp-connector/src/UKHASExtractor.h
\ No newline at end of file
diff --git a/src/include/habitat/Uploader.h b/src/include/habitat/Uploader.h
index 9ba5ac83..7ded9971 120000
--- a/src/include/habitat/Uploader.h
+++ b/src/include/habitat/Uploader.h
@@ -1 +1 @@
-../../../habitat_extensions/cpp_connector/src/Uploader.h
\ No newline at end of file
+../../../habitat-cpp-connector/src/Uploader.h
\ No newline at end of file
diff --git a/src/include/habitat/UploaderThread.h b/src/include/habitat/UploaderThread.h
index 4360b832..3b0d80eb 120000
--- a/src/include/habitat/UploaderThread.h
+++ b/src/include/habitat/UploaderThread.h
@@ -1 +1 @@
-../../../habitat_extensions/cpp_connector/src/UploaderThread.h
\ No newline at end of file
+../../../habitat-cpp-connector/src/UploaderThread.h
\ No newline at end of file