diff --git a/functions/defaults.sh b/functions/defaults.sh
index 87b3a5351..dd0ef9f77 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -69,7 +69,8 @@ New_configuration ()
 	export LIVE_IMAGE_TYPE
 }
 
-Set_config_defaults ()
+# Prepare config for use, filling in defaults where no value provided for instance
+Prepare_config ()
 {
 	# FIXME
 	New_configuration
diff --git a/functions/init.sh b/functions/init.sh
index 23c403427..c050b495b 100755
--- a/functions/init.sh
+++ b/functions/init.sh
@@ -28,7 +28,7 @@ Init_config_data ()
 	Arguments "${@}"
 
 	Read_conffiles $(Common_config_files)
-	Set_config_defaults
+	Prepare_config
 }
 
 # "Auto" script redirection.
diff --git a/scripts/build/config b/scripts/build/config
index 74c11ba0b..d9ada6f84 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -937,7 +937,7 @@ then
 fi
 
 # Setting and validating config
-Set_config_defaults
+Prepare_config
 Validate_config
 
 # Creating or updating saved config