diff --git a/Dockerfile b/Dockerfile
index 26225f92..7ab41938 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -147,8 +147,8 @@ RUN useradd -s /sbin/nologin -u 9001 -g 9001 mockbuild && \
 # Inherited  tools for mock stuff
 # we at least need the mock_cache_unlock tool
 # they install into /usr/bin
-COPY toCOPY/cgcs_overlay /opt/cgcs_overlay
-RUN cd /opt/cgcs_overlay && \
+COPY toCOPY/mock_overlay /opt/mock_overlay
+RUN cd /opt/mock_overlay && \
     make && \
     make install
 
diff --git a/toCOPY/cgcs_overlay/Makefile b/toCOPY/mock_overlay/Makefile
similarity index 100%
rename from toCOPY/cgcs_overlay/Makefile
rename to toCOPY/mock_overlay/Makefile
diff --git a/toCOPY/cgcs_overlay/mount_wrappers/Makefile b/toCOPY/mock_overlay/mount_wrappers/Makefile
similarity index 100%
rename from toCOPY/cgcs_overlay/mount_wrappers/Makefile
rename to toCOPY/mock_overlay/mount_wrappers/Makefile
diff --git a/toCOPY/cgcs_overlay/mount_wrappers/README b/toCOPY/mock_overlay/mount_wrappers/README
similarity index 100%
rename from toCOPY/cgcs_overlay/mount_wrappers/README
rename to toCOPY/mock_overlay/mount_wrappers/README
diff --git a/toCOPY/cgcs_overlay/mount_wrappers/mock_cache_umount.c b/toCOPY/mock_overlay/mount_wrappers/mock_cache_umount.c
similarity index 100%
rename from toCOPY/cgcs_overlay/mount_wrappers/mock_cache_umount.c
rename to toCOPY/mock_overlay/mount_wrappers/mock_cache_umount.c
diff --git a/toCOPY/cgcs_overlay/mount_wrappers/mock_cache_umount.sh b/toCOPY/mock_overlay/mount_wrappers/mock_cache_umount.sh
similarity index 100%
rename from toCOPY/cgcs_overlay/mount_wrappers/mock_cache_umount.sh
rename to toCOPY/mock_overlay/mount_wrappers/mock_cache_umount.sh
diff --git a/toCOPY/cgcs_overlay/mount_wrappers/mock_cache_unlock.c b/toCOPY/mock_overlay/mount_wrappers/mock_cache_unlock.c
similarity index 100%
rename from toCOPY/cgcs_overlay/mount_wrappers/mock_cache_unlock.c
rename to toCOPY/mock_overlay/mount_wrappers/mock_cache_unlock.c
diff --git a/toCOPY/cgcs_overlay/mount_wrappers/mock_cache_unlock.sh b/toCOPY/mock_overlay/mount_wrappers/mock_cache_unlock.sh
similarity index 100%
rename from toCOPY/cgcs_overlay/mount_wrappers/mock_cache_unlock.sh
rename to toCOPY/mock_overlay/mount_wrappers/mock_cache_unlock.sh
diff --git a/toCOPY/cgcs_overlay/mount_wrappers/mock_tmpfs_mount.c b/toCOPY/mock_overlay/mount_wrappers/mock_tmpfs_mount.c
similarity index 100%
rename from toCOPY/cgcs_overlay/mount_wrappers/mock_tmpfs_mount.c
rename to toCOPY/mock_overlay/mount_wrappers/mock_tmpfs_mount.c
diff --git a/toCOPY/cgcs_overlay/mount_wrappers/mock_tmpfs_mount.sh b/toCOPY/mock_overlay/mount_wrappers/mock_tmpfs_mount.sh
similarity index 100%
rename from toCOPY/cgcs_overlay/mount_wrappers/mock_tmpfs_mount.sh
rename to toCOPY/mock_overlay/mount_wrappers/mock_tmpfs_mount.sh
diff --git a/toCOPY/cgcs_overlay/mount_wrappers/mock_tmpfs_umount.c b/toCOPY/mock_overlay/mount_wrappers/mock_tmpfs_umount.c
similarity index 100%
rename from toCOPY/cgcs_overlay/mount_wrappers/mock_tmpfs_umount.c
rename to toCOPY/mock_overlay/mount_wrappers/mock_tmpfs_umount.c
diff --git a/toCOPY/cgcs_overlay/mount_wrappers/mock_tmpfs_umount.sh b/toCOPY/mock_overlay/mount_wrappers/mock_tmpfs_umount.sh
similarity index 100%
rename from toCOPY/cgcs_overlay/mount_wrappers/mock_tmpfs_umount.sh
rename to toCOPY/mock_overlay/mount_wrappers/mock_tmpfs_umount.sh
diff --git a/toCOPY/cgcs_overlay/mount_wrappers/overlay_mount.c b/toCOPY/mock_overlay/mount_wrappers/overlay_mount.c
similarity index 100%
rename from toCOPY/cgcs_overlay/mount_wrappers/overlay_mount.c
rename to toCOPY/mock_overlay/mount_wrappers/overlay_mount.c
diff --git a/toCOPY/cgcs_overlay/mount_wrappers/overlay_mount.sh b/toCOPY/mock_overlay/mount_wrappers/overlay_mount.sh
similarity index 100%
rename from toCOPY/cgcs_overlay/mount_wrappers/overlay_mount.sh
rename to toCOPY/mock_overlay/mount_wrappers/overlay_mount.sh
diff --git a/toCOPY/cgcs_overlay/mount_wrappers/overlay_umount.c b/toCOPY/mock_overlay/mount_wrappers/overlay_umount.c
similarity index 100%
rename from toCOPY/cgcs_overlay/mount_wrappers/overlay_umount.c
rename to toCOPY/mock_overlay/mount_wrappers/overlay_umount.c
diff --git a/toCOPY/cgcs_overlay/mount_wrappers/overlay_umount.sh b/toCOPY/mock_overlay/mount_wrappers/overlay_umount.sh
similarity index 100%
rename from toCOPY/cgcs_overlay/mount_wrappers/overlay_umount.sh
rename to toCOPY/mock_overlay/mount_wrappers/overlay_umount.sh
diff --git a/tox.ini b/tox.ini
index ada40858..1ef026fd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,7 @@ commands =
             -print0 | xargs -0 yamllint"
   bash -c "find {toxinidir}          \
          -not \( -type d -name .?\* -prune \) \
-         -not \( -type d -path {toxinidir}/toCOPY/cgcs_overlay -prune \) \
+         -not \( -type d -path {toxinidir}/toCOPY/mock_overlay -prune \) \
          -type f                              \
          -not -name \*~                       \
          -not -name \*.md                     \