diff --git a/bin/cdist-config b/bin/cdist-config
index b2ab1f8e..cf26bf90 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -145,6 +145,13 @@ __cdist_object_list()
       sed -e "s;$__cdist_name_object_source\$;;" -e 's;^./;;'
 }
 
+__cdist_object_source()
+{
+   local object_dir="$1"; shift
+
+   cat "${object_dir}/$__cdist_name_object_source"
+}
+
 __cdist_tmp_removal()
 {
    rm -rf "${__cdist_tmp_dir}"
diff --git a/bin/cdist_tree_wrapper b/bin/cdist_tree_wrapper
index dde151b5..1beda316 100755
--- a/bin/cdist_tree_wrapper
+++ b/bin/cdist_tree_wrapper
@@ -30,26 +30,26 @@
 
 set -eu
 
-echo "I am $__cdist_myname and have been called with $@"
-
 export __cdist_object_id="$1"; shift
-export __cdist_type_current="$__cdist_myname"
+export __cdist_type="$__cdist_myname"
 
 echo "$__cdist_object_id" | grep -q "^${__cdist_sane_regexp}\$" || \
    __cdist_usage "Insane object id, ${__cdist_object_id}."
 
-__cdist_tid="${__cdist_type_current}/${__cdist_object_id}"
-__cdist_ddir="$__cdist_output_dir/${__cdist_tid}"
+__cdist_object="${__cdist_type}/${__cdist_object_id}"
+__cdist_ddir="$__cdist_output_dir/${__cdist_object}"
 
 if [ -e "${__cdist_ddir}" ]; then
    source="$(__cdist_object_source "${__cdist_ddir}")"
-   __cdist_exit_err "${__cdist_tid} already exists (source: $source)"
+   __cdist_exit_err "${__cdist_object} already exists (source: $source)"
 fi
 
 mkdir -p "${__cdist_ddir}"
 
+# echo "I am $__cdist_myname and have been called with $@"
+
 # Record (correct ;-) source
-echo "${__cdist_manifest}" > "${__cdist_ddir}/${__cdist_object_source}"
+echo "${__cdist_manifest}" > "${__cdist_ddir}/${__cdist_name_object_source}"
 
 while [ $# -gt 0 ]; do
    opt="$1"; shift