diff --git a/bin/cdist-config b/bin/cdist-config
index 504970d1..7f68ca67 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -196,14 +196,14 @@ __cdist_type_gencode()
    echo "${__cdist_type_dir}/$1/${__cdist_name_gencode}"
 }
 
-__cdist_type_param_dir()
+__cdist_type_parameter_dir()
 {
    echo "$(__cdist_type_dir "$1")/${__cdist_name_parameter}"
 }
 
-__cdist_type_param_file()
+__cdist_type_parameter_file()
 {
-   echo "$(__cdist_type_param_dir "$1")/$2"
+   echo "$(__cdist_type_parameter_dir "$1")/$2"
 }
 
 __cdist_type_from_object()
diff --git a/bin/cdist-type-emulator b/bin/cdist-type-emulator
index 9283052d..69be9405 100755
--- a/bin/cdist-type-emulator
+++ b/bin/cdist-type-emulator
@@ -78,14 +78,14 @@ while read required; do
    fi
 
    mv "${tempparameter}/${required}" "${__cdist_parameter_dir}"
-done < "$(__cdist_type_param_file "$__cdist_type" "$__cdist_name_parameter_required")"
+done < "$(__cdist_type_parameter_file "$__cdist_type" "$__cdist_name_parameter_required")"
 
 # Allow optional parameters
 while read optional; do
    if [ -f "${tempparameter}/${optional}" ]; then
       mv "${tempparameter}/${optional}" "${__cdist_parameter_dir}"
    fi
-done < "$(__cdist_type_param_file "$__cdist_type" "$__cdist_name_parameter_optional")"
+done < "$(__cdist_type_parameter_file "$__cdist_type" "$__cdist_name_parameter_optional")"
 
 # Error out on other paramaters
 cd "${tempparameter}"