diff --git a/bin/cdist-deploy-to b/bin/cdist-deploy-to
index c576dfd6..5d06cf96 100755
--- a/bin/cdist-deploy-to
+++ b/bin/cdist-deploy-to
@@ -58,7 +58,7 @@ cdist-manifest-run-all        "$__cdist_target_host" "$__cdist_out_object_dir"
 cdist-object-explorer-all     "$__cdist_target_host" "$__cdist_out_object_dir"
 
 # Generate code for all objects
-cdist-object-codegen-all      "$__cdist_target_host" "$__cdist_out_object_dir"
+cdist-object-gencode-all      "$__cdist_target_host" "$__cdist_out_object_dir"
 
 # Transfer all objects including code
 cdist-dir push "$__cdist_target_host" "$__cdist_out_object_dir" \
diff --git a/bin/cdist-object-codegen b/bin/cdist-object-gencode
similarity index 100%
rename from bin/cdist-object-codegen
rename to bin/cdist-object-gencode
diff --git a/bin/cdist-object-codegen-all b/bin/cdist-object-gencode-all
similarity index 96%
rename from bin/cdist-object-codegen-all
rename to bin/cdist-object-gencode-all
index 67f05186..40c39fd4 100755
--- a/bin/cdist-object-codegen-all
+++ b/bin/cdist-object-gencode-all
@@ -39,7 +39,7 @@ while read object; do
    code="$(__cdist_object_code "$object")"
    echo "Generating  code  for $object ..."
 
-   cdist-object-codegen "$__cdist_target_host"     \
+   cdist-object-gencode "$__cdist_target_host"     \
                         "$__cdist_object_base_dir" \
                         "$object" > "${code}"