diff --git a/bin/cdist-config b/bin/cdist-config
index 8320879a..68df3d4b 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -33,7 +33,12 @@
 : ${__cdist_name_gencode:=gencode}
 : ${__cdist_name_host:=hosts}
 : ${__cdist_name_init:=init}
-: ${__cdist_name_manifest:=manifests}
+
+# Name of the manifest file in types
+: ${__cdist_name_manifest:=manifest}
+
+# Name of the base directory containing the initial manifests
+: ${__cdist_name_manifests:=manifests}
 : ${__cdist_name_object:=objects}
 
 : ${__cdist_name_type:=types}
@@ -54,7 +59,7 @@
 # Base
 : ${__cdist_config:=/etc/cdist}
 : ${__cdist_explorer_dir:=$__cdist_config/$__cdist_name_explorer}
-: ${__cdist_manifest_dir:=$__cdist_config/$__cdist_name_manifest}
+: ${__cdist_manifest_dir:=$__cdist_config/$__cdist_name_manifests}
 : ${__cdist_manifest_init:=$__cdist_manifest_dir/$__cdist_name_init}
 : ${__cdist_type_dir:=$__cdist_config/$__cdist_name_type}
 
@@ -151,10 +156,14 @@ __cdist_object_list()
 {
    local basedir="$1"; shift
 
-   cd "${basedir}"
+   # Use subshell to prevent changing cwd in program
+   (
+      cd "${basedir}"
+
+      find . -name "$__cdist_name_object_source" |    \
+         sed -e "s;$__cdist_name_object_source\$;;" -e 's;^./;;'
+   )
 
-   find . -name "$__cdist_name_object_source" |    \
-      sed -e "s;$__cdist_name_object_source\$;;" -e 's;^./;;'
 }
 
 __cdist_object_source()