diff --git a/bin/cdist-config b/bin/cdist-config
index 867ab135..56f62144 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -397,7 +397,7 @@ __cdist_type_explorer_pushed_add()
 
 __cdist_type_gencode()
 {
-   echo "${__cdist_type_dir}/$1/${__cdist_name_gencode}"
+   echo "${__cdist_type_dir}/$1/${__cdist_name_gencode}-$2"
 }
 
 __cdist_type_manifest()
diff --git a/bin/cdist-object-gencode b/bin/cdist-object-gencode
index 642e29b1..757e03f0 100755
--- a/bin/cdist-object-gencode
+++ b/bin/cdist-object-gencode
@@ -33,10 +33,8 @@ __cdist_gencode_type="$1"; shift
 __cdist_object_dir="$(__cdist_object_dir "$__cdist_object_self")"
 __cdist_type="$(__cdist_type_from_object "$__cdist_object_self")"
 __cdist_object_id="$(__cdist_object_id_from_object "$__cdist_object_self")"
-__cdist_code_output="$(__cdist_object_code "$__cdist_object_self" "${__cdist_gencode_type}")"
-
-# Full path to where the executable of the type should exist, if the type has one
-gencode="$(__cdist_type_gencode "$__cdist_type")-${__cdist_gencode_type}"
+__cdist_code_output="$(__cdist_object_code "$__cdist_object_self" "$__cdist_gencode_type")"
+gencode="$(__cdist_type_gencode "$__cdist_type" "$__cdist_gencode_type")"
 
 # export variables for gencode
 export __object_id="$__cdist_object_id"