diff --git a/src/image_mad/remotes/fs/cp b/src/image_mad/remotes/fs/cp
index b6bd552b24..2ef4f8a2d8 100755
--- a/src/image_mad/remotes/fs/cp
+++ b/src/image_mad/remotes/fs/cp
@@ -24,14 +24,12 @@
 # ------------ Set up the environment to source common tools ------------ 
 
 if [ -z "${ONE_LOCATION}" ]; then
-    TMCOMMON=/usr/lib/one/mads/tm_common.sh
-    VAR_LOCATION=/var/lib/one/
+    LIB_LOCATION=/usr/lib/one
 else
-    TMCOMMON=$ONE_LOCATION/lib/mads/tm_common.sh
-    VAR_LOCATION=$ONE_LOCATION/var/
+    LIB_LOCATION=$ONE_LOCATION/lib
 fi
 
-. $TMCOMMON
+. $LIB_LOCATION/sh/scripts_common.sh
 
 # ------------ Copy the image to the repository ------------ 
 
diff --git a/src/image_mad/remotes/fs/mkfs b/src/image_mad/remotes/fs/mkfs
index 5d2093e602..e57fd2fce5 100755
--- a/src/image_mad/remotes/fs/mkfs
+++ b/src/image_mad/remotes/fs/mkfs
@@ -24,12 +24,12 @@
 # ------------ Set up the environment to source common tools ------------ 
 
 if [ -z "${ONE_LOCATION}" ]; then
-    TMCOMMON=/usr/lib/one/mads/tm_common.sh
+    LIB_LOCATION=/usr/lib/one
 else
-    TMCOMMON=$ONE_LOCATION/lib/mads/tm_common.sh
+    LIB_LOCATION=$ONE_LOCATION/lib
 fi
 
-. $TMCOMMON
+. $LIB_LOCATION/sh/scripts_common.sh
 
 # ------------ Create the image to the repository ------------ 
 
diff --git a/src/image_mad/remotes/fs/mv b/src/image_mad/remotes/fs/mv
index e4e9e5676d..a1e2eadd3f 100755
--- a/src/image_mad/remotes/fs/mv
+++ b/src/image_mad/remotes/fs/mv
@@ -24,14 +24,12 @@
 # ------------ Set up the environment to source common tools ------------ 
 
 if [ -z "${ONE_LOCATION}" ]; then
-    TMCOMMON=/usr/lib/one/mads/tm_common.sh
-    VAR_LOCATION=/var/lib/one/
+    LIB_LOCATION=/usr/lib/one
 else
-    TMCOMMON=$ONE_LOCATION/lib/mads/tm_common.sh
-    VAR_LOCATION=$ONE_LOCATION/var/
+    LIB_LOCATION=$ONE_LOCATION/lib
 fi
 
-. $TMCOMMON
+. $LIB_LOCATION/sh/scripts_common.sh
 
 # ------------ Move the image to the repository ------------ 
 
diff --git a/src/image_mad/remotes/fs/rm b/src/image_mad/remotes/fs/rm
index 2303682fa5..5526887226 100755
--- a/src/image_mad/remotes/fs/rm
+++ b/src/image_mad/remotes/fs/rm
@@ -23,14 +23,12 @@
 # ------------ Set up the environment to source common tools ------------ 
 
 if [ -z "${ONE_LOCATION}" ]; then
-    TMCOMMON=/usr/lib/one/mads/tm_common.sh
-    VAR_LOCATION=/var/lib/one/
+    LIB_LOCATION=/usr/lib/one
 else
-    TMCOMMON=$ONE_LOCATION/lib/mads/tm_common.sh
-    VAR_LOCATION=$ONE_LOCATION/var/
+    LIB_LOCATION=$ONE_LOCATION/lib
 fi
 
-. $TMCOMMON
+. $LIB_LOCATION/sh/scripts_common.sh
 
 # ------------ Remove the image to the repository ------------