diff --git a/bin/cdist-config b/bin/cdist-config
index 2c751cd8..19c127d4 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -63,6 +63,7 @@ __cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
 : ${__cdist_name_parameter_required:=required}
 : ${__cdist_name_parameter_optional:=optional}
 : ${__cdist_name_require:=require}
+: ${__cdist_name_self:=self}
 : ${__cdist_name_singleton:=singleton}
 : ${__cdist_name_target_host:=target_host}
 : ${__cdist_name_target_user:=target_user}
@@ -89,6 +90,7 @@ __cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
 : ${__cdist_name_var_target_user:=__$__cdist_name_target_user}
 : ${__cdist_name_var_object:=__$__cdist_name_object}
 : ${__cdist_name_var_object_id:=__$__cdist_name_object_id}
+: ${__cdist_name_var_self:=__$__cdist_name_self}
 : ${__cdist_name_var_type:=__$__cdist_name_type}
 
 
diff --git a/bin/cdist-object-explorer-run b/bin/cdist-object-explorer-run
index 72ca7a1d..99e12e89 100755
--- a/bin/cdist-object-explorer-run
+++ b/bin/cdist-object-explorer-run
@@ -55,6 +55,7 @@ if [ "$__cdist_has_explorer" ]; then
    cdist-run-remote "$__cdist_target_host"                     \
       "__object=\"$(__cdist_remote_object_dir "$__object")\""  \
       "__object_id=\"$__object_id\""                           \
+      "$__cdist_name_var_self=\"$__cdist_object\""              \
       cdist-remote-explorer-run                                \
       "$__cdist_name_var_type_explorer"                        \
       "$(__cdist_remote_type_explorer_dir "$__cdist_type")"    \
diff --git a/bin/cdist-object-run b/bin/cdist-object-run
index af543316..450ba361 100755
--- a/bin/cdist-object-run
+++ b/bin/cdist-object-run
@@ -33,6 +33,8 @@ set -eu
 
 __cdist_target_host="$1"; shift
 __cdist_object="$1"; shift
+# Export to non-core for use in manifest and gencode scripts
+export $__cdist_name_var_self=$__cdist_object
 
 __cdist_type="$(__cdist_type_from_object "$__cdist_object")"