diff --git a/addons/kanako_menu b/addons/kanako_menu
index 106d8a9..20be3c5 100755
--- a/addons/kanako_menu
+++ b/addons/kanako_menu
@@ -1,9 +1,9 @@
 #!/bin/sh -e
-readonly conf_dir="${conf_dir:-$HOME/.config/kanako}"
-readonly store_dir="${store_dir:-$HOME/.kanako-store}"
+readonly kanako_conf_dir="${conf_dir:-$HOME/.config/kanako}"
+readonly kanako_store_dir="${store_dir:-$HOME/.kanako-store}"
 
-if test -f "${conf_dir}"/kanako.conf; then
-    . "${conf_dir}"/kanako.conf
+if test -f "${kanako_conf_dir}"/kanako.conf; then
+    . "${kanako_conf_dir}"/kanako.conf
 else
     echo "Configuration file has not been found!"
     exit 1
diff --git a/kanako b/kanako
index 4df0001..290e71d 100755
--- a/kanako
+++ b/kanako
@@ -1,19 +1,19 @@
 #!/bin/sh -e
 
-readonly conf_dir="${conf_dir:-$HOME/.config/kanako}"
-readonly key_dir="${key_dir:-$HOME/.kanako}"
-readonly store_dir="${store_dir:-$HOME/.kanako-store}"
+readonly kanako_conf_dir="${kanako_conf_dir:-$HOME/.config/kanako}"
+readonly kanako_key_dir="${kanako_key_dir:-$HOME/.kanako}"
+readonly kanako_store_dir="${kanako_store_dir:-$HOME/.kanako-store}"
 
-if test -d "${store_dir}"; then
-    cd "${store_dir}"
+if test -d "${kanako_store_dir}"; then
+    cd "${kanako_store_dir}"
 else
     echo "Password store not found!"
-    echo "Create it with `mkdir -p $store_dir`"
+    echo "Create it with mkdir -p $kanako_store_dir"
     exit 1
 fi
 
-if test -f "${conf_dir}/kanako.conf"; then
-    . "${conf_dir}/kanako.conf";
+if test -f "${kanako_conf_dir}/kanako.conf"; then
+    . "${kanako_conf_dir}/kanako.conf";
 else
     echo "Configuration file has not been found!"
     echo "Copy kanako.conf from the examples directory,"