diff --git a/TESTING b/TESTING
index d0206bfda..c48dbf6ed 100644
--- a/TESTING
+++ b/TESTING
@@ -21,11 +21,11 @@ do:
 The above configures CRDS to run the built-in unit tests using several file
 sources:
 
-- $CRDS_TEST_ROOT/crds-cache-test           
+- $CRDS_TEST_ROOT/crds-cache-test
   Dirty test cache with corrupted/hacked files, used by tests only.
   Has the dangerous property of like-named files (same as official names) with different contents.
 
-- $CRDS_TEST_ROOT/crds-cache-default-test    
+- $CRDS_TEST_ROOT/crds-cache-default-test
   Used when CRDS_PATH not set,  replaces /grp/crds/cache with minimal reference files for testing
   /grp/crds/cache is a complete HST + JWST readonly cache on the Central Store,  too large to distribute
 
@@ -50,7 +50,7 @@ Notes on crds-cache-default-test bootstrap file CRDS server setup:
       $ tar jcf crds-cache-default-test.tar.bz2 crds-cache-default-test
 
       The resulting bzip2 file is copied to the HST OPS VM at the
-      $CRDS/CRDS_server/sources/static directory where the source code of all the other
+      $CRDS/CRDS_server/crds_server/static directory where the source code of all the other
       server static files resides.  This will cause it to be re-installed in the Apache
       static directory whenever the server is re-installed.   Merely placing the bzip2
       file in the Apache static directory will result in a file life expectancy of 1 day,
diff --git a/clean b/clean
index 8eda1d267..97e2abb26 100755
--- a/clean
+++ b/clean
@@ -6,10 +6,10 @@ if ( "$*" == "" ) then
     set dirs=". crds"
 else
     set dirs="$*"
-endif 
+endif
 
 if (-e ../CRDS_server) then
-    set dirs="$dirs ../CRDS_server/sources"
+    set dirs="$dirs ../CRDS_server/crds_server"
 endif
 
 foreach pat ('*.orig' '*.pyc' 'build' '__pycache__' '*~' '.*~' '#*#' '#.*#')
@@ -23,4 +23,3 @@ rm -rf dist MANIFEST
 rm -rf build
 rm -rf install.log
 git checkout -- crds/core/git_version.py
-
diff --git a/documentation/crds_users_guide/Makefile b/documentation/crds_users_guide/Makefile
index 3ea4320a9..28f00d601 100644
--- a/documentation/crds_users_guide/Makefile
+++ b/documentation/crds_users_guide/Makefile
@@ -6,7 +6,7 @@
 #  Principle make targets:
 #
 #  make html         # for development,  look at build/html/index.html
-#  make serverhtml   # to install HTML in parallel CRDS_server repo checkout in sources/static
+#  make serverhtml   # to install HTML in parallel CRDS_server repo checkout in crds_server/static
 #  make latexpdf     # generate a PDF of the docs
 #
 
@@ -176,7 +176,7 @@ tarhtml: html
 	rm -rf users_guide
 
 serverhtml: tarhtml
-	mv users_guide.tar.gz ../../../CRDS_server/sources/static
-	cd ../../../CRDS_server/sources/static; \
+	mv users_guide.tar.gz ../../../CRDS_server/crds_server/static
+	cd ../../../CRDS_server/crds_server/static; \
 	tar zxf users_guide.tar.gz; \
 	rm users_guide.tar.gz