diff --git a/bin/cdist-config b/bin/cdist-config
index d9e35c02..77f60605 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -35,8 +35,8 @@ set -au
 : ${__cdist_name_gencode:=gencode}
 : ${__cdist_name_host:=hosts}
 : ${__cdist_name_init:=init}
-: ${__cdist_name_out_dir:=out_dir}
-: ${__cdist_name_conf_dir:=conf_dir}
+: ${__cdist_name_out_dir:=out}
+: ${__cdist_name_conf_dir:=conf}
 
 # Name of the manifest file in types
 : ${__cdist_name_manifest:=manifest}
@@ -80,7 +80,7 @@ __cdist_sane_regexp='[A-Za-z0-9]*[-A-Za-z0-9_]*'
 : ${__cdist_remote_explorer_dir:=$__cdist_remote_conf_dir/$__cdist_name_explorer}
 : ${__cdist_remote_bin_dir:=$__cdist_remote_conf_dir/$__cdist_name_bin}
 
-# Remot} out
+# Remote out
 : ${__cdist_remote_out_dir:=$__cdist_remote_base_dir/$__cdist_name_out_dir}
 : ${__cdist_remote_out_explorer_dir:=$__cdist_remote_out_dir/$__cdist_name_explorer}