diff --git a/bin/cdist-build-bin b/bin/cdist-type-build-emulation
similarity index 100%
rename from bin/cdist-build-bin
rename to bin/cdist-type-build-emulation
diff --git a/bin/cdist_tree_wrapper b/bin/cdist-type-emulator
similarity index 100%
rename from bin/cdist_tree_wrapper
rename to bin/cdist-type-emulator
diff --git a/conf/explorers/pkg_system b/conf/explorers/pkg_system
index dc1bd129..d6467631 100755
--- a/conf/explorers/pkg_system
+++ b/conf/explorers/pkg_system
@@ -19,7 +19,7 @@
 #
 #
 
-case "$(./os)" in
+case "$(./conf/explorers/os)" in
       archlinux) echo pacman ;;
       debian|ubuntu) echo apt ;;
       gentoo) echo emerge ;;