diff --git a/README.org b/README.org
index 49eaa78..53f4f9e 100644
--- a/README.org
+++ b/README.org
@@ -57,16 +57,16 @@ To run ~byggsteg~ as a shepherd daemon, you can try this:
                 #:environment-variables
                 (list
                  "LANG=en_US.UTF-8"
-                 "BYGGSTEG_LS=/run/current-system/profile/bin/ls"
-                 "BYGGSTEG_XXD=/run/current-system/profile/bin/xxd"
-                 "BYGGSTEG_MKDIR=/run/current-system/profile/bin/xxd"
-                 "BYGGSTEG_STACK=/run/current-system/profile/bin/stack"
-                 "BYGGSTEG_CD=/run/current-system/profile/bin/cd"
-                 "BYGGSTEG_GIT=/run/current-system/profile/bin/git"
-                 "BYGGSTEG_ECHO=/run/current-system/profile/bin/echo"
-                 "BYGGSTEG_MAKE=/run/current-system/profile/bin/make"
-                 "BYGGSTEG_RM=/run/current-system/profile/bin/rm"
-                 "BYGGSTEG_PYTHON=/run/current-system/profile/bin/python"
+                 "BYGGSTEG_LS_PATH=/run/current-system/profile/bin/ls"
+                 "BYGGSTEG_XXD_PATH=/run/current-system/profile/bin/xxd"
+                 "BYGGSTEG_MKDIR_PATH=/run/current-system/profile/bin/xxd"
+                 "BYGGSTEG_STACK_PATH=/run/current-system/profile/bin/stack"
+                 "BYGGSTEG_CD_PATH=/run/current-system/profile/bin/cd"
+                 "BYGGSTEG_GIT_PATH=/run/current-system/profile/bin/git"
+                 "BYGGSTEG_ECHO_PATH=/run/current-system/profile/bin/echo"
+                 "BYGGSTEG_MAKE_PATH=/run/current-system/profile/bin/make"
+                 "BYGGSTEG_RM_PATH=/run/current-system/profile/bin/rm"
+                 "BYGGSTEG_PYTHON_PATH=/run/current-system/profile/bin/python"
                  "GUILE_AUTO_COMPILE=0")))
       (stop #~(make-kill-destructor))
       (auto-start? #t)
diff --git a/src/html.scm b/src/html.scm
index 80682c2..db41cc0 100644
--- a/src/html.scm
+++ b/src/html.scm
@@ -115,10 +115,10 @@
   (let* ((kv (read-url-encoded-body body))
          (log-filename (url-decode (car (assoc-ref kv "log-filename")))))
     
-    (syscall (format #f "~a -rfv ~a" byggsteg-rm-location (string-append job-log-location log-filename)))
-    (syscall (format #f "~a -rfv ~a" byggsteg-rm-location (string-append job-failure-location log-filename)))
-    (syscall (format #f "~a -rfv ~a" byggsteg-rm-location (string-append job-success-location log-filename)))
-    (syscall (format #f "~a -rfv ~a" byggsteg-rm-location (string-append job-detail-location log-filename)))
+    (syscall (format #f "~a -rfv ~a" byggsteg-rm-path (string-append job-log-location log-filename)))
+    (syscall (format #f "~a -rfv ~a" byggsteg-rm-path (string-append job-failure-location log-filename)))
+    (syscall (format #f "~a -rfv ~a" byggsteg-rm-path (string-append job-success-location log-filename)))
+    (syscall (format #f "~a -rfv ~a" byggsteg-rm-path (string-append job-detail-location log-filename)))
 
     (respond #f
              `()
@@ -129,7 +129,7 @@
   (let* ((kv (read-url-encoded-body body))
          (profile-name (url-decode (car (assoc-ref kv "profile-name")))))
     
-    (syscall (format #f "~a -rfv ~a" byggsteg-rm-location (string-append profile-location profile-name)))
+    (syscall (format #f "~a -rfv ~a" byggsteg-rm-path (string-append profile-location profile-name)))
 
     (respond #f
              `()
diff --git a/src/prelude.scm b/src/prelude.scm
index 0eda2d5..14bc3c8 100644
--- a/src/prelude.scm
+++ b/src/prelude.scm
@@ -11,16 +11,16 @@
   )
 
 (define-public locale (car (string-split (getenv "LANG") #\_) ))
-(define-public byggsteg-ls-path (getenv "BYGGSTEG_LS"))
-(define-public byggsteg-xxd-path (getenv "BYGGSTEG_XXD"))
-(define-public byggsteg-mkdir-path (getenv "BYGGSTEG_MKDIR"))
-(define-public byggsteg-stack-path (getenv "BYGGSTEG_STACK"))
-(define-public byggsteg-cd-path (getenv "BYGGSTEG_CD"))
-(define-public byggsteg-git-path (getenv "BYGGSTEG_GIT"))
-(define-public byggsteg-make-path (getenv "BYGGSTEG_MAKE"))
-(define-public byggsteg-echo-path (getenv "BYGGSTEG_ECHO"))
-(define-public byggsteg-python-path (getenv "BYGGSTEG_PYTHON"))
-(define-public byggsteg-rm-path (getenv "BYGGSTEG_RM"))
+(define-public byggsteg-ls-path (getenv "BYGGSTEG_LS_PATH"))
+(define-public byggsteg-xxd-path (getenv "BYGGSTEG_XXD_PATH"))
+(define-public byggsteg-mkdir-path (getenv "BYGGSTEG_MKDIR_PATH"))
+(define-public byggsteg-stack-path (getenv "BYGGSTEG_STACK_PATH"))
+(define-public byggsteg-cd-path (getenv "BYGGSTEG_CD_PATH"))
+(define-public byggsteg-git-path (getenv "BYGGSTEG_GIT_PATH"))
+(define-public byggsteg-make-path (getenv "BYGGSTEG_MAKE_PATH"))
+(define-public byggsteg-echo-path (getenv "BYGGSTEG_ECHO_PATH"))
+(define-public byggsteg-python-path (getenv "BYGGSTEG_PYTHON_PATH"))
+(define-public byggsteg-rm-path (getenv "BYGGSTEG_RM_PATH"))
 
 
 (define-public (ii sym)