diff --git a/conf/explorer/pkg_system b/conf/explorer/pkg_system
index 552209a1..fad2a9f0 100755
--- a/conf/explorer/pkg_system
+++ b/conf/explorer/pkg_system
@@ -19,7 +19,7 @@
 #
 #
 
-os="$("$__explorers/os")"
+os="$("$__explorer/os")"
 
 case "$os" in
       archlinux) echo pacman ;;
diff --git a/conf/manifest/init b/conf/manifest/init
index 2bc47e15..260fb490 100755
--- a/conf/manifest/init
+++ b/conf/manifest/init
@@ -4,7 +4,7 @@
 
 # This is debug and should not be in a production environment
 echo "Running initial manifest for $__target_host"
-echo "We could access other manifests in $__manifests"
+echo "We could access other manifests in $__manifest"
 
 case "$__target_host" in
    localhost)
diff --git a/conf/type/__file/parameters/optional b/conf/type/__file/parameter/optional
similarity index 100%
rename from conf/type/__file/parameters/optional
rename to conf/type/__file/parameter/optional
diff --git a/conf/type/__file/parameters/required b/conf/type/__file/parameter/required
similarity index 100%
rename from conf/type/__file/parameters/required
rename to conf/type/__file/parameter/required
diff --git a/conf/type/__issue/parameters/optional b/conf/type/__issue/parameter/optional
similarity index 100%
rename from conf/type/__issue/parameters/optional
rename to conf/type/__issue/parameter/optional
diff --git a/conf/type/__issue/parameters/required b/conf/type/__issue/parameter/required
similarity index 100%
rename from conf/type/__issue/parameters/required
rename to conf/type/__issue/parameter/required
diff --git a/conf/type/__package/parameters/optional b/conf/type/__package/parameter/optional
similarity index 100%
rename from conf/type/__package/parameters/optional
rename to conf/type/__package/parameter/optional
diff --git a/conf/type/__package/parameters/required b/conf/type/__package/parameter/required
similarity index 100%
rename from conf/type/__package/parameters/required
rename to conf/type/__package/parameter/required
diff --git a/conf/type/__package_emerge/parameters/optional b/conf/type/__package_emerge/parameter/optional
similarity index 100%
rename from conf/type/__package_emerge/parameters/optional
rename to conf/type/__package_emerge/parameter/optional
diff --git a/conf/type/__package_emerge/parameters/required b/conf/type/__package_emerge/parameter/required
similarity index 100%
rename from conf/type/__package_emerge/parameters/required
rename to conf/type/__package_emerge/parameter/required