diff --git a/cider-util.el b/cider-util.el
index 69db48af5..ba17578d7 100644
--- a/cider-util.el
+++ b/cider-util.el
@@ -524,9 +524,11 @@ Any other value is just returned."
                    (file-executable-p file)))
       file)))
 
+(defconst cider--temp-name-prefix ".cider__")
+
 (defun cider--make-temp-name (file)
   (make-temp-name
-   (concat ".cider__" (file-name-nondirectory file) "__")))
+   (concat cider--temp-name-prefix (file-name-nondirectory file) "__")))
 
 (defun cider--make-nearby-temp-copy (file)
   (let* ((default-directory (or (clojure-project-dir) default-directory))
diff --git a/cider.el b/cider.el
index ec0a7c30c..9270a2511 100644
--- a/cider.el
+++ b/cider.el
@@ -412,14 +412,17 @@ without interfering with classloaders."
   :safe #'booleanp)
 
 (defvar cider--enrich-classpath-script-names
-  '((lein . "enrich_lein.sh")
-    (clojure-cli . "enrich_clojure.sh")))
+  '((lein . "lein.sh")
+    (clojure-cli . "clojure.sh")))
 
 (defun cider--enriched-cmd-p (cmd)
   "Test if the shell-quoted CMD contains the name of an enrich-classpath script.
 Returns the local path to the script or nil."
   (let* ((script-names (map-values cider--enrich-classpath-script-names))
-         (any-name  (rx-to-string `(or ,@script-names)))
+         (temp-prefix cider--temp-name-prefix)
+         (any-name  (rx-to-string
+                     `(or (: (or bos "/") (or ,@script-names) (or eos space))
+                          (: ,temp-prefix (or ,@script-names)))))
          (script (thread-last
                    (split-string-shell-command cmd)
                    (seq-filter (lambda (part) (string-match any-name part)))
diff --git a/enrich_clojure.sh b/clojure.sh
similarity index 100%
rename from enrich_clojure.sh
rename to clojure.sh
diff --git a/enrich_lein.sh b/lein.sh
similarity index 100%
rename from enrich_lein.sh
rename to lein.sh