diff --git a/src/python/dm/aps_beamline_tools/gui/genParamsTab.py b/src/python/dm/aps_beamline_tools/gui/genParamsTab.py
index 2f9214b1e992e8fc707cdf98fc8d93dbce1447d4..6b54195dfd24e3de076a250a9a281636a64fde42 100644
--- a/src/python/dm/aps_beamline_tools/gui/genParamsTab.py
+++ b/src/python/dm/aps_beamline_tools/gui/genParamsTab.py
@@ -82,7 +82,8 @@ class GenParamsTab(QWidget):
                     continue
                 original = entry.split(':')[0]
                 replacement = entry.split(':')[1]
-                dirPath = dirPath.replace(original,replacement)
+                if dirPath.startswith(original):
+                    dirPath = dirPath.replace(original,replacement)
         return self.assembleUrl(scheme, host, port, dirPath)
 
     @classmethod
diff --git a/src/python/dm/common/cli/dmCli.py b/src/python/dm/common/cli/dmCli.py
index 91f799a6a7bdfd892f445f1edf3a235fc28817f6..3221372c803ca7294d85dc48879f13ab07abf126 100755
--- a/src/python/dm/common/cli/dmCli.py
+++ b/src/python/dm/common/cli/dmCli.py
@@ -301,7 +301,8 @@ class DmCli(object):
                     continue
                 original = entry.split(':')[0]
                 replacement = entry.split(':')[1]
-                dirPath = dirPath.replace(original,replacement)
+                if dirPath.startswith(original):
+                    dirPath = dirPath.replace(original,replacement)
         return self.assembleUrl(scheme, host, port, dirPath)
 
     @classmethod