diff --git a/bin/cdist-build-bin b/bin/cdist-build-bin
index a7ae3735..18b0dfbb 100755
--- a/bin/cdist-build-bin
+++ b/bin/cdist-build-bin
@@ -38,5 +38,5 @@ ls -1 > "${__cdist_tmp_file}"
 # Create binaries
 mkdir -p "${__cdist_cache_bin}"
 while read type; do
-   ln -sf "${__cdist_tree_wrapper}" "${__cdist_cache_bin}/${__cdist_bin_prefix}${type}"
+   ln -sf "${__cdist_tree_wrapper}" "${__cdist_cache_bin}/${type}"
 done < "${__cdist_tmp_file}"
diff --git a/bin/cdist-config b/bin/cdist-config
index 186b176d..5d308598 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -75,9 +75,6 @@ __cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
 ################################################################################
 # Other constants
 
-# Used for generating binaries in cdist-build-bin
-__cdist_bin_prefix="__"
-
 # Used for IDs
 __cdist_sane_regexp='[A-Za-z0-9]*[-A-Za-z0-9_]*'