diff --git a/bin/cdist-config b/bin/cdist-config
index 2e5c63b1..e1e82f28 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -55,7 +55,7 @@ __cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
 : ${__cdist_name_manifest:=manifest}
 : ${__cdist_name_object:=object}
 : ${__cdist_name_object_finished:=done}
-: ${__cdist_name_object_processed:=processed}
+: ${__cdist_name_object_prepared:=prepared}
 : ${__cdist_name_object_id:=object_id}
 : ${__cdist_name_object_source:=source}
 : ${__cdist_name_objects_created:=.objects_created}
@@ -210,9 +210,9 @@ __cdist_object_code()
    echo "$(__cdist_object_dir "$1")/${__cdist_name_code}"
 }
 
-__cdist_object_processed()
+__cdist_object_prepared()
 {
-   echo "$(__cdist_object_dir "$1")/${__cdist_name_object_processed}"
+   echo "$(__cdist_object_dir "$1")/${__cdist_name_object_prepared}"
 }
 
 __cdist_object_finished()
diff --git a/bin/cdist-deploy-to b/bin/cdist-deploy-to
index 02fd34fa..dab5d9a5 100755
--- a/bin/cdist-deploy-to
+++ b/bin/cdist-deploy-to
@@ -49,7 +49,7 @@ cdist-dir push                "$__cdist_target_host" \
    "${__cdist_abs_mydir}" "${__cdist_remote_bin_dir}"
 cdist-explorer-run-global     "$__cdist_target_host"
 cdist-manifest-run-init       "$__cdist_target_host"
-cdist-object-all              "$__cdist_target_host" cdist-object-process
+cdist-object-all              "$__cdist_target_host" cdist-object-prepare
 cdist-object-all              "$__cdist_target_host" cdist-object-run
 cdist-cache                   "$__cdist_target_host"
 
diff --git a/bin/cdist-object-process b/bin/cdist-object-prepare
similarity index 85%
rename from bin/cdist-object-process
rename to bin/cdist-object-prepare
index 777d2c88..8c92ff73 100755
--- a/bin/cdist-object-process
+++ b/bin/cdist-object-prepare
@@ -36,13 +36,13 @@ __cdist_object_dir="$(__cdist_object_dir "$__cdist_object")"
 # Export to non-core for use in manifest and gencode scripts
 export $__cdist_name_var_self=$__cdist_object
 
-__cdist_object_processed="$(__cdist_object_processed "$__cdist_object")"
-if [ ! -f "$__cdist_object_processed" ]; then
+__cdist_object_prepared="$(__cdist_object_prepared "$__cdist_object")"
+if [ ! -f "$__cdist_object_prepared" ]; then
    echo
-   echo "Processing object $__cdist_object"
+   echo "Preparing object $__cdist_object"
    cdist-object-explorer-run  "$__cdist_target_host" "$__cdist_object"
    cdist-object-manifest-run  "$__cdist_target_host" "$__cdist_object"
 
-   # Mark this object as processed
-   touch "$__cdist_object_processed"
+   # Mark this object as prepared
+   touch "$__cdist_object_prepared"
 fi