diff --git a/le b/le
deleted file mode 100755
index 17ec1cc..0000000
--- a/le
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-subcommand=$1; shift
-
-"le-$subcommand" "$@"
diff --git a/sub/issue b/le-issue
similarity index 95%
rename from sub/issue
rename to le-issue
index ffd7b1e..df60a11 100755
--- a/sub/issue
+++ b/le-issue
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
-source lib/util
+LPATH=( /usr/lib/le "$HOME/.local/lib/le" "lib/le" "lib" )
+for l in "${LPATH[@]}"; do
+	[[ -f "$l/util" ]] && source "$l/util"
+done
 
 gen_san_string() {
 	declare d
diff --git a/sub/renew b/le-renew
similarity index 90%
rename from sub/renew
rename to le-renew
index 7c1b17d..d84f6db 100755
--- a/sub/renew
+++ b/le-renew
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
-source lib/util
+LPATH=( /usr/lib/le "$HOME/.local/lib/le" "lib/le" "lib" )
+for l in "${LPATH[@]}"; do
+	[[ -f "$l/util" ]] && source "$l/util"
+done
 
 usage() {
 	while read -r line; do printf '%s\n' "$line"; done <<- EOF
@@ -69,7 +72,7 @@ main() {
 			le_args+=( "$d" )
 		done
 
-		le issue "${le_args[@]}"
+		le-issue "${le_args[@]}"
 
 		if (( $? )); then
 			> "$cfg_dir/domains/$certname/renew.fail"