diff --git a/doc/source/cli b/doc/source/cli
index db72f7bfb..e565da8e3 120000
--- a/doc/source/cli
+++ b/doc/source/cli
@@ -1 +1 @@
-../../d1_client_cli/doc
\ No newline at end of file
+../../client_cli/doc
\ No newline at end of file
diff --git a/doc/source/client b/doc/source/client
index 5b8991151..69a30000b 120000
--- a/doc/source/client
+++ b/doc/source/client
@@ -1 +1 @@
-../../d1_libclient_python/doc
\ No newline at end of file
+../../lib_client/doc
\ No newline at end of file
diff --git a/doc/source/common b/doc/source/common
index c12b804ca..4e1f72c34 120000
--- a/doc/source/common
+++ b/doc/source/common
@@ -1 +1 @@
-../../d1_common_python/doc
\ No newline at end of file
+../../lib_common/doc
\ No newline at end of file
diff --git a/doc/source/gmn b/doc/source/gmn
index 27f37e529..ed719e134 120000
--- a/doc/source/gmn
+++ b/doc/source/gmn
@@ -1 +1 @@
-../../d1_mn_generic/doc
\ No newline at end of file
+../../gmn/doc
\ No newline at end of file
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 0f5d052b1..a7731679a 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -55,13 +55,6 @@ DataONE Client Library for Python
 
 \
 
-DataONE Workspace Client for Python
-```````````````````````````````````
-
-.. include:: ./workspace/overview.rst
-
-\
-
 DataONE Test Utilities
 ``````````````````````
 
@@ -80,5 +73,4 @@ Contents
   gmn/index
   common/index
   client/index
-  workspace/index
   test/index
diff --git a/doc/source/onedrive b/doc/source/onedrive
index b0ede0d67..0a3dacc8d 120000
--- a/doc/source/onedrive
+++ b/doc/source/onedrive
@@ -1 +1 @@
-../../d1_client_onedrive/doc
\ No newline at end of file
+../../client_onedrive/doc
\ No newline at end of file
diff --git a/doc/source/test b/doc/source/test
index afc246355..55a3762df 120000
--- a/doc/source/test
+++ b/doc/source/test
@@ -1 +1 @@
-../../d1_test_utilities_python/doc
\ No newline at end of file
+../../test_utilities/doc
\ No newline at end of file
diff --git a/doc/source/workspace b/doc/source/workspace
deleted file mode 120000
index 509a27186..000000000
--- a/doc/source/workspace
+++ /dev/null
@@ -1 +0,0 @@
-../../d1_workspace_client/doc
\ No newline at end of file