From 8147cd1aea8936f48d10c7ebbd576894077a8b97 Mon Sep 17 00:00:00 2001
From: Kevin Day <thekevinday@gmail.com>
Date: Sun, 13 Feb 2022 22:58:26 -0600
Subject: [PATCH] Regression: The path_headers_preserve isn't properly being
 processed and refactor it to preserve_path_headers.

It seems that I changed the path_sources.used to path_headers.used, probably thinking that I had previously made a mistake.
Rename the preserve to preserve_offset to make the intent and purpose more obvious.
The preserve_offset represents and offset to skip before performing the preserve.
The path_sources is the path that should be ignored (path_headers is not used here!).

Refactor path_headers_preserve to preserve_path_headers to make it clearer that this is not a path but instead a property related to a path.
---
 build/level_0/settings                        |  2 +-
 build/level_1/settings                        |  2 +-
 build/level_2/settings                        |  2 +-
 build/monolithic/settings                     |  2 +-
 build/scripts/bootstrap.sh                    | 38 +++++++++----------
 level_0/f_account/data/build/settings         |  2 +-
 level_0/f_account/data/build/settings-mocks   |  2 +-
 level_0/f_account/data/build/settings-tests   |  2 +-
 level_0/f_capability/data/build/settings      |  2 +-
 .../f_capability/data/build/settings-mocks    |  2 +-
 .../f_capability/data/build/settings-tests    |  2 +-
 level_0/f_color/data/build/settings           |  2 +-
 level_0/f_color/data/build/settings-mocks     |  2 +-
 level_0/f_color/data/build/settings-tests     |  2 +-
 level_0/f_console/data/build/settings         |  2 +-
 level_0/f_console/data/build/settings-tests   |  2 +-
 level_0/f_control_group/data/build/settings   |  2 +-
 .../f_control_group/data/build/settings-tests |  2 +-
 level_0/f_conversion/data/build/settings      |  2 +-
 .../f_conversion/data/build/settings-mocks    |  2 +-
 .../f_conversion/data/build/settings-tests    |  2 +-
 level_0/f_directory/data/build/settings       |  2 +-
 level_0/f_environment/data/build/settings     |  2 +-
 level_0/f_execute/data/build/settings         |  2 +-
 level_0/f_file/data/build/settings            |  2 +-
 level_0/f_fss/data/build/settings             |  2 +-
 level_0/f_iki/data/build/settings             |  2 +-
 level_0/f_limit/data/build/settings           |  2 +-
 level_0/f_memory/data/build/settings          |  2 +-
 level_0/f_memory/data/build/settings-tests    |  2 +-
 level_0/f_path/data/build/settings            |  2 +-
 level_0/f_pipe/data/build/settings            |  2 +-
 level_0/f_print/data/build/settings           |  2 +-
 level_0/f_serialize/data/build/settings       |  2 +-
 level_0/f_signal/data/build/settings          |  2 +-
 level_0/f_socket/data/build/settings          |  2 +-
 level_0/f_status/data/build/settings          |  2 +-
 level_0/f_status_string/data/build/settings   |  2 +-
 level_0/f_string/data/build/settings          |  2 +-
 level_0/f_thread/data/build/settings          |  2 +-
 level_0/f_type/data/build/settings            |  2 +-
 level_0/f_type_array/data/build/settings      |  2 +-
 .../f_type_array/data/build/settings-tests    |  2 +-
 level_0/f_utf/data/build/settings             |  2 +-
 level_1/fl_control_group/data/build/settings  |  2 +-
 level_1/fl_conversion/data/build/settings     |  2 +-
 level_1/fl_directory/data/build/settings      |  2 +-
 level_1/fl_environment/data/build/settings    |  2 +-
 level_1/fl_execute/data/build/settings        |  2 +-
 level_1/fl_fss/data/build/settings            |  2 +-
 level_1/fl_iki/data/build/settings            |  2 +-
 level_1/fl_print/data/build/settings          |  2 +-
 level_1/fl_signal/data/build/settings         |  2 +-
 level_1/fl_string/data/build/settings         |  2 +-
 level_1/fl_utf/data/build/settings            |  2 +-
 level_1/fl_utf_file/data/build/settings       |  2 +-
 level_2/fll_control_group/data/build/settings |  2 +-
 level_2/fll_error/data/build/settings         |  2 +-
 level_2/fll_execute/data/build/settings       |  2 +-
 level_2/fll_file/data/build/settings          |  2 +-
 level_2/fll_fss/data/build/settings           |  2 +-
 .../fll_fss_status_string/data/build/settings |  2 +-
 level_2/fll_iki/data/build/settings           |  2 +-
 level_2/fll_path/data/build/settings          |  2 +-
 level_2/fll_print/data/build/settings         |  2 +-
 level_2/fll_program/data/build/settings       |  2 +-
 level_2/fll_status_string/data/build/settings |  2 +-
 level_3/byte_dump/data/build/settings         |  2 +-
 level_3/control/data/build/settings           |  2 +-
 level_3/controller/data/build/settings        |  2 +-
 level_3/fake/c/private-build-load.c           | 26 ++++++-------
 level_3/fake/c/private-build.c                | 16 ++++----
 level_3/fake/c/private-build.h                |  6 +--
 level_3/fake/c/private-common.c               |  2 +-
 level_3/fake/c/private-common.h               |  8 ++--
 level_3/fake/data/build/settings              |  2 +-
 level_3/fake/documents/settings.txt           | 14 +++----
 level_3/fake/specifications/settings.txt      |  2 +-
 level_3/firewall/data/build/settings          |  2 +-
 .../fss_basic_list_read/data/build/settings   |  2 +-
 .../fss_basic_list_write/data/build/settings  |  2 +-
 level_3/fss_basic_read/data/build/settings    |  2 +-
 level_3/fss_basic_write/data/build/settings   |  2 +-
 .../data/build/settings                       |  2 +-
 .../data/build/settings                       |  2 +-
 .../data/build/settings                       |  2 +-
 .../data/build/settings                       |  2 +-
 level_3/fss_extended_read/data/build/settings |  2 +-
 .../fss_extended_write/data/build/settings    |  2 +-
 level_3/fss_identify/data/build/settings      |  2 +-
 level_3/fss_payload_read/data/build/settings  |  2 +-
 level_3/fss_payload_write/data/build/settings |  2 +-
 level_3/fss_status_code/data/build/settings   |  2 +-
 level_3/iki_read/data/build/settings          |  2 +-
 level_3/iki_write/data/build/settings         |  2 +-
 level_3/status_code/data/build/settings       |  2 +-
 level_3/utf8/data/build/settings              |  2 +-
 97 files changed, 145 insertions(+), 145 deletions(-)

diff --git a/build/level_0/settings b/build/level_0/settings
index 3f8c90b8d..8f50de336 100644
--- a/build/level_0/settings
+++ b/build/level_0/settings
@@ -52,7 +52,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/build/level_1/settings b/build/level_1/settings
index e4d48e54d..c4e1d77a9 100644
--- a/build/level_1/settings
+++ b/build/level_1/settings
@@ -52,7 +52,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_1
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/build/level_2/settings b/build/level_2/settings
index e6541092d..eb1981c55 100644
--- a/build/level_2/settings
+++ b/build/level_2/settings
@@ -52,7 +52,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_2
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/build/monolithic/settings b/build/monolithic/settings
index 25849bd6d..dd4c5524f 100644
--- a/build/monolithic/settings
+++ b/build/monolithic/settings
@@ -52,7 +52,7 @@ build_shared yes
 build_static no
 
 path_headers fll
-path_headers_preserve yes
+preserve_path_headers yes
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/build/scripts/bootstrap.sh b/build/scripts/bootstrap.sh
index a7146a73f..553e7071d 100644
--- a/build/scripts/bootstrap.sh
+++ b/build/scripts/bootstrap.sh
@@ -494,20 +494,20 @@ bootstrap_id() {
     "modes") echo -n 56;;
     "modes_default") echo -n 57;;
     "path_headers") echo -n 58;;
-    "path_headers_preserve") echo -n 59;;
-    "path_language") echo -n 60;;
-    "path_library_script") echo -n 61;;
-    "path_library_shared") echo -n 62;;
-    "path_library_static") echo -n 63;;
-    "path_object_script") echo -n 64;;
-    "path_object_shared") echo -n 65;;
-    "path_object_static") echo -n 66;;
-    "path_program_script") echo -n 67;;
-    "path_program_shared") echo -n 68;;
-    "path_program_static") echo -n 69;;
-    "path_sources") echo -n 70;;
-    "path_sources_object") echo -n 71;;
-    "path_standard") echo -n 72;;
+    "path_language") echo -n 59;;
+    "path_library_script") echo -n 60;;
+    "path_library_shared") echo -n 61;;
+    "path_library_static") echo -n 62;;
+    "path_object_script") echo -n 63;;
+    "path_object_shared") echo -n 64;;
+    "path_object_static") echo -n 65;;
+    "path_program_script") echo -n 66;;
+    "path_program_shared") echo -n 67;;
+    "path_program_static") echo -n 68;;
+    "path_sources") echo -n 69;;
+    "path_sources_object") echo -n 70;;
+    "path_standard") echo -n 71;;
+    "preserve_path_headers") echo -n 72;;
     "process_post") echo -n 73;;
     "process_pre") echo -n 74;;
     "search_exclusive") echo -n 75;;
@@ -581,7 +581,7 @@ bootstrap_id() {
     "flags_shared-$mode") echo -n 142;;
     "flags_static-$mode") echo -n 143;;
     "path_headers-$mode") echo -n 144;;
-    "path_headers_preserve-$mode") echo -n 145;;
+    "preserve_path_headers-$mode") echo -n 145;;
     "path_language-$mode") echo -n 146;;
     "path_library_script-$mode") echo -n 147;;
     "path_library_shared-$mode") echo -n 148;;
@@ -666,7 +666,7 @@ bootstrap_load_settings() {
     fi
   done
 
-  for i in environment flags flags_library flags_library_shared flags_library_static flags_object flags_object_shared flags_object_static flags_program flags_program_shared flags_program_static flags_shared flags_static modes modes_default path_headers path_headers_preserve path_language path_library_script path_library_shared path_library_static path_object_script path_object_shared path_object_static path_program_script path_program_shared path_program_static path_sources path_sources_object path_standard process_post process_pre search_exclusive search_shared search_static version_file version_major version_major_prefix version_micro version_micro_prefix version_minor version_minor_prefix version_nano version_nano_prefix version_target ; do
+  for i in environment flags flags_library flags_library_shared flags_library_static flags_object flags_object_shared flags_object_static flags_program flags_program_shared flags_program_static flags_shared flags_static modes modes_default path_headers path_language path_library_script path_library_shared path_library_static path_object_script path_object_shared path_object_static path_program_script path_program_shared path_program_static path_sources path_sources_object path_standard preserve_path_headers process_post process_pre search_exclusive search_shared search_static version_file version_major version_major_prefix version_micro version_micro_prefix version_minor version_minor_prefix version_nano version_nano_prefix version_target ; do
     key=$(bootstrap_id $i)
 
     if [[ $key == "" ]] ; then
@@ -695,7 +695,7 @@ bootstrap_load_settings_mode() {
     fi
   done
 
-  for i in environment-$mode flags-$mode flags_library-$mode flags_library_shared-$mode flags_library_static-$mode flags_object-$mode flags_object_shared-$mode flags_object_static-$mode flags_program-$mode flags_program_shared-$mode flags_program_static-$mode flags_shared-$mode flags_static-$mode path_headers-$mode path_headers_preserve-$mode path_language-$mode path_library_script-$mode path_library_shared-$mode path_library_static-$mode path_object_script-$mode path_object_shared-$mode path_object_static-$mode path_program_script-$mode path_program_shared-$mode path_program_static-$mode path_sources-$mode path_sources_object-$mode path_standard-$mode process_post-$mode process_pre-$mode search_exclusive-$mode search_shared-$mode search_static-$mode version_file-$mode version_major-$mode version_major_prefix-$mode version_micro-$mode version_micro_prefix-$mode version_minor-$mode version_minor_prefix-$mode version_nano-$mode version_nano_prefix-$mode version_target-$mode ; do
+  for i in environment-$mode flags-$mode flags_library-$mode flags_library_shared-$mode flags_library_static-$mode flags_object-$mode flags_object_shared-$mode flags_object_static-$mode flags_program-$mode flags_program_shared-$mode flags_program_static-$mode flags_shared-$mode flags_static-$mode path_headers-$mode path_language-$mode path_library_script-$mode path_library_shared-$mode path_library_static-$mode path_object_script-$mode path_object_shared-$mode path_object_static-$mode path_program_script-$mode path_program_shared-$mode path_program_static-$mode path_sources-$mode path_sources_object-$mode path_standard-$mode preserve_path_headers-$mode process_post-$mode process_pre-$mode search_exclusive-$mode search_shared-$mode search_static-$mode version_file-$mode version_major-$mode version_major_prefix-$mode version_micro-$mode version_micro_prefix-$mode version_minor-$mode version_minor_prefix-$mode version_nano-$mode version_nano_prefix-$mode version_target-$mode ; do
     key=$(bootstrap_id $i)
 
     if [[ $key == "" ]] ; then
@@ -817,7 +817,7 @@ bootstrap_operation_build() {
   local objects_program_shared=${variables[$(bootstrap_id build_objects_program_shared)]}
   local objects_program_static=${variables[$(bootstrap_id build_objects_program_static)]}
   local path_headers=${variables[$(bootstrap_id path_headers)]}
-  local path_headers_preserve=${variables[$(bootstrap_id path_headers_preserve)]}
+  local preserve_path_headers=${variables[$(bootstrap_id preserve_path_headers)]}
   local path_library_script=${variables[$(bootstrap_id path_library_script)]}
   local path_library_shared=${variables[$(bootstrap_id path_library_shared)]}
   local path_library_static=${variables[$(bootstrap_id path_library_static)]}
@@ -919,7 +919,7 @@ bootstrap_operation_build() {
   fi
 
   if [[ $failure -eq 0 && $sources_headers != "" ]] ; then
-    if [[ $path_headers_preserve == "yes" ]] ; then
+    if [[ $preserve_path_headers == "yes" ]] ; then
       for i in $sources_headers ; do
         directory=$(dirname $i)
 
diff --git a/level_0/f_account/data/build/settings b/level_0/f_account/data/build/settings
index 62252e485..8fa4917bc 100644
--- a/level_0/f_account/data/build/settings
+++ b/level_0/f_account/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_account/data/build/settings-mocks b/level_0/f_account/data/build/settings-mocks
index 11d9242ea..27f340e11 100644
--- a/level_0/f_account/data/build/settings-mocks
+++ b/level_0/f_account/data/build/settings-mocks
@@ -35,7 +35,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_account/data/build/settings-tests b/level_0/f_account/data/build/settings-tests
index bd6fa2050..23b02c0c1 100644
--- a/level_0/f_account/data/build/settings-tests
+++ b/level_0/f_account/data/build/settings-tests
@@ -25,7 +25,7 @@ build_shared yes
 build_static no
 
 path_headers tests/unit/c
-path_headers_preserve no
+preserve_path_headers no
 path_sources tests/unit/c
 path_standard no
 
diff --git a/level_0/f_capability/data/build/settings b/level_0/f_capability/data/build/settings
index c4dfddcbb..7fffa01f6 100644
--- a/level_0/f_capability/data/build/settings
+++ b/level_0/f_capability/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_capability/data/build/settings-mocks b/level_0/f_capability/data/build/settings-mocks
index ba98f0269..740d03b6b 100644
--- a/level_0/f_capability/data/build/settings-mocks
+++ b/level_0/f_capability/data/build/settings-mocks
@@ -42,7 +42,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_capability/data/build/settings-tests b/level_0/f_capability/data/build/settings-tests
index 497189eac..c4e2cdba7 100644
--- a/level_0/f_capability/data/build/settings-tests
+++ b/level_0/f_capability/data/build/settings-tests
@@ -25,7 +25,7 @@ build_shared yes
 build_static no
 
 path_headers tests/unit/c
-path_headers_preserve no
+preserve_path_headers no
 path_sources tests/unit/c
 path_standard no
 
diff --git a/level_0/f_color/data/build/settings b/level_0/f_color/data/build/settings
index df9274100..0c4b68529 100644
--- a/level_0/f_color/data/build/settings
+++ b/level_0/f_color/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_color/data/build/settings-mocks b/level_0/f_color/data/build/settings-mocks
index 7d39c541a..3c7b0e227 100644
--- a/level_0/f_color/data/build/settings-mocks
+++ b/level_0/f_color/data/build/settings-mocks
@@ -37,7 +37,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_color/data/build/settings-tests b/level_0/f_color/data/build/settings-tests
index 93dfe55e3..90dc1fd6d 100644
--- a/level_0/f_color/data/build/settings-tests
+++ b/level_0/f_color/data/build/settings-tests
@@ -25,7 +25,7 @@ build_shared yes
 build_static no
 
 path_headers tests/unit/c
-path_headers_preserve no
+preserve_path_headers no
 path_sources tests/unit/c
 path_standard no
 
diff --git a/level_0/f_console/data/build/settings b/level_0/f_console/data/build/settings
index b26fdecc7..37e4a1ee4 100644
--- a/level_0/f_console/data/build/settings
+++ b/level_0/f_console/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_console/data/build/settings-tests b/level_0/f_console/data/build/settings-tests
index 210211ae7..f35e3f191 100644
--- a/level_0/f_console/data/build/settings-tests
+++ b/level_0/f_console/data/build/settings-tests
@@ -25,7 +25,7 @@ build_shared yes
 build_static no
 
 path_headers tests/unit/c
-path_headers_preserve no
+preserve_path_headers no
 path_sources tests/unit/c
 path_standard no
 
diff --git a/level_0/f_control_group/data/build/settings b/level_0/f_control_group/data/build/settings
index 9a1c25a59..566cf79b8 100644
--- a/level_0/f_control_group/data/build/settings
+++ b/level_0/f_control_group/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_control_group/data/build/settings-tests b/level_0/f_control_group/data/build/settings-tests
index 43d26d796..9e579f758 100644
--- a/level_0/f_control_group/data/build/settings-tests
+++ b/level_0/f_control_group/data/build/settings-tests
@@ -25,7 +25,7 @@ build_shared yes
 build_static no
 
 path_headers tests/unit/c
-path_headers_preserve no
+preserve_path_headers no
 path_sources tests/unit/c
 path_standard no
 
diff --git a/level_0/f_conversion/data/build/settings b/level_0/f_conversion/data/build/settings
index 745974814..7756618d0 100644
--- a/level_0/f_conversion/data/build/settings
+++ b/level_0/f_conversion/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_conversion/data/build/settings-mocks b/level_0/f_conversion/data/build/settings-mocks
index d95d0bb86..94317a16d 100644
--- a/level_0/f_conversion/data/build/settings-mocks
+++ b/level_0/f_conversion/data/build/settings-mocks
@@ -37,7 +37,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_conversion/data/build/settings-tests b/level_0/f_conversion/data/build/settings-tests
index 40951cc8a..18bd2c0fd 100644
--- a/level_0/f_conversion/data/build/settings-tests
+++ b/level_0/f_conversion/data/build/settings-tests
@@ -25,7 +25,7 @@ build_shared yes
 build_static no
 
 path_headers tests/unit/c
-path_headers_preserve no
+preserve_path_headers no
 path_sources tests/unit/c
 path_standard no
 
diff --git a/level_0/f_directory/data/build/settings b/level_0/f_directory/data/build/settings
index 323b372ab..42e58a7fe 100644
--- a/level_0/f_directory/data/build/settings
+++ b/level_0/f_directory/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_environment/data/build/settings b/level_0/f_environment/data/build/settings
index 6b3c45698..f518b9889 100644
--- a/level_0/f_environment/data/build/settings
+++ b/level_0/f_environment/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_execute/data/build/settings b/level_0/f_execute/data/build/settings
index f0a25043b..f32dd6a26 100644
--- a/level_0/f_execute/data/build/settings
+++ b/level_0/f_execute/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_file/data/build/settings b/level_0/f_file/data/build/settings
index 2e2014bc1..0cce9e60f 100644
--- a/level_0/f_file/data/build/settings
+++ b/level_0/f_file/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_fss/data/build/settings b/level_0/f_fss/data/build/settings
index 82173522f..52c63389b 100644
--- a/level_0/f_fss/data/build/settings
+++ b/level_0/f_fss/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_iki/data/build/settings b/level_0/f_iki/data/build/settings
index 1ef2b757f..767088550 100644
--- a/level_0/f_iki/data/build/settings
+++ b/level_0/f_iki/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_limit/data/build/settings b/level_0/f_limit/data/build/settings
index 11f441e84..8fab95a52 100644
--- a/level_0/f_limit/data/build/settings
+++ b/level_0/f_limit/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_memory/data/build/settings b/level_0/f_memory/data/build/settings
index 5877e857f..7d7cd2d57 100644
--- a/level_0/f_memory/data/build/settings
+++ b/level_0/f_memory/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_memory/data/build/settings-tests b/level_0/f_memory/data/build/settings-tests
index 6c8723ecd..419caa9ab 100644
--- a/level_0/f_memory/data/build/settings-tests
+++ b/level_0/f_memory/data/build/settings-tests
@@ -23,7 +23,7 @@ build_shared yes
 build_static no
 
 path_headers tests/unit/c
-path_headers_preserve no
+preserve_path_headers no
 path_sources tests/unit/c
 path_standard no
 
diff --git a/level_0/f_path/data/build/settings b/level_0/f_path/data/build/settings
index b134b3435..13719347f 100644
--- a/level_0/f_path/data/build/settings
+++ b/level_0/f_path/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_pipe/data/build/settings b/level_0/f_pipe/data/build/settings
index aae882dae..d39a4857b 100644
--- a/level_0/f_pipe/data/build/settings
+++ b/level_0/f_pipe/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_print/data/build/settings b/level_0/f_print/data/build/settings
index e45c6d6f0..091b8b0a4 100644
--- a/level_0/f_print/data/build/settings
+++ b/level_0/f_print/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_serialize/data/build/settings b/level_0/f_serialize/data/build/settings
index 39bf67d62..3eefb212f 100644
--- a/level_0/f_serialize/data/build/settings
+++ b/level_0/f_serialize/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_signal/data/build/settings b/level_0/f_signal/data/build/settings
index 75b3cccf0..6add29f52 100644
--- a/level_0/f_signal/data/build/settings
+++ b/level_0/f_signal/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_socket/data/build/settings b/level_0/f_socket/data/build/settings
index 84299735c..37821c311 100644
--- a/level_0/f_socket/data/build/settings
+++ b/level_0/f_socket/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_status/data/build/settings b/level_0/f_status/data/build/settings
index 3b92f8514..dbf3d28f0 100644
--- a/level_0/f_status/data/build/settings
+++ b/level_0/f_status/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_status_string/data/build/settings b/level_0/f_status_string/data/build/settings
index 51f97a47b..e45993728 100644
--- a/level_0/f_status_string/data/build/settings
+++ b/level_0/f_status_string/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_string/data/build/settings b/level_0/f_string/data/build/settings
index 44f81dacd..6301736dc 100644
--- a/level_0/f_string/data/build/settings
+++ b/level_0/f_string/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_thread/data/build/settings b/level_0/f_thread/data/build/settings
index ed8750acf..071e7e02e 100644
--- a/level_0/f_thread/data/build/settings
+++ b/level_0/f_thread/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_type/data/build/settings b/level_0/f_type/data/build/settings
index 4c9ee36ad..ea25dfb4a 100644
--- a/level_0/f_type/data/build/settings
+++ b/level_0/f_type/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_type_array/data/build/settings b/level_0/f_type_array/data/build/settings
index 159590666..e2e1090b0 100644
--- a/level_0/f_type_array/data/build/settings
+++ b/level_0/f_type_array/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_0/f_type_array/data/build/settings-tests b/level_0/f_type_array/data/build/settings-tests
index 9e8777e96..26833d423 100644
--- a/level_0/f_type_array/data/build/settings-tests
+++ b/level_0/f_type_array/data/build/settings-tests
@@ -34,7 +34,7 @@ build_shared yes
 build_static no
 
 path_headers tests/unit/c
-path_headers_preserve no
+preserve_path_headers no
 path_sources tests/unit/c
 path_standard no
 
diff --git a/level_0/f_utf/data/build/settings b/level_0/f_utf/data/build/settings
index 2e700f8fe..3910de2de 100644
--- a/level_0/f_utf/data/build/settings
+++ b/level_0/f_utf/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_0
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_1/fl_control_group/data/build/settings b/level_1/fl_control_group/data/build/settings
index 19c591f41..3d746073e 100644
--- a/level_1/fl_control_group/data/build/settings
+++ b/level_1/fl_control_group/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_1
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_1/fl_conversion/data/build/settings b/level_1/fl_conversion/data/build/settings
index 60e516682..1fac30d97 100644
--- a/level_1/fl_conversion/data/build/settings
+++ b/level_1/fl_conversion/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_1
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_1/fl_directory/data/build/settings b/level_1/fl_directory/data/build/settings
index cad2924eb..4040cdc12 100644
--- a/level_1/fl_directory/data/build/settings
+++ b/level_1/fl_directory/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_1
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_1/fl_environment/data/build/settings b/level_1/fl_environment/data/build/settings
index 217fb5bc6..61c6f8037 100644
--- a/level_1/fl_environment/data/build/settings
+++ b/level_1/fl_environment/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_1
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_1/fl_execute/data/build/settings b/level_1/fl_execute/data/build/settings
index 214fd1f87..62542522f 100644
--- a/level_1/fl_execute/data/build/settings
+++ b/level_1/fl_execute/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_1
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_1/fl_fss/data/build/settings b/level_1/fl_fss/data/build/settings
index faf9f86c2..769bccb59 100644
--- a/level_1/fl_fss/data/build/settings
+++ b/level_1/fl_fss/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_1
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_1/fl_iki/data/build/settings b/level_1/fl_iki/data/build/settings
index d04429ec7..85610ac65 100644
--- a/level_1/fl_iki/data/build/settings
+++ b/level_1/fl_iki/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_1
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_1/fl_print/data/build/settings b/level_1/fl_print/data/build/settings
index 44266e7e3..5365c0216 100644
--- a/level_1/fl_print/data/build/settings
+++ b/level_1/fl_print/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_1
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_1/fl_signal/data/build/settings b/level_1/fl_signal/data/build/settings
index 23a28e857..1a850b7be 100644
--- a/level_1/fl_signal/data/build/settings
+++ b/level_1/fl_signal/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_1
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_1/fl_string/data/build/settings b/level_1/fl_string/data/build/settings
index d214ca94b..fd6c43a60 100644
--- a/level_1/fl_string/data/build/settings
+++ b/level_1/fl_string/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_1
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_1/fl_utf/data/build/settings b/level_1/fl_utf/data/build/settings
index accb21bb5..239e72b95 100644
--- a/level_1/fl_utf/data/build/settings
+++ b/level_1/fl_utf/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_1
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_1/fl_utf_file/data/build/settings b/level_1/fl_utf_file/data/build/settings
index 6a2f03f39..06d0278a5 100644
--- a/level_1/fl_utf_file/data/build/settings
+++ b/level_1/fl_utf_file/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_1
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_2/fll_control_group/data/build/settings b/level_2/fll_control_group/data/build/settings
index b136e3bf5..7eff62231 100644
--- a/level_2/fll_control_group/data/build/settings
+++ b/level_2/fll_control_group/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_2
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_2/fll_error/data/build/settings b/level_2/fll_error/data/build/settings
index 65acc2765..6d694102d 100644
--- a/level_2/fll_error/data/build/settings
+++ b/level_2/fll_error/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_2
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_2/fll_execute/data/build/settings b/level_2/fll_execute/data/build/settings
index 1369fa4f2..fe0f0d4b5 100644
--- a/level_2/fll_execute/data/build/settings
+++ b/level_2/fll_execute/data/build/settings
@@ -50,7 +50,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_2
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_2/fll_file/data/build/settings b/level_2/fll_file/data/build/settings
index 6ffbc4ac4..fe0b1aff9 100644
--- a/level_2/fll_file/data/build/settings
+++ b/level_2/fll_file/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_2
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_2/fll_fss/data/build/settings b/level_2/fll_fss/data/build/settings
index 17d1c931c..d31cf4412 100644
--- a/level_2/fll_fss/data/build/settings
+++ b/level_2/fll_fss/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_2
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_2/fll_fss_status_string/data/build/settings b/level_2/fll_fss_status_string/data/build/settings
index 147256212..f218762a1 100644
--- a/level_2/fll_fss_status_string/data/build/settings
+++ b/level_2/fll_fss_status_string/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_2
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_2/fll_iki/data/build/settings b/level_2/fll_iki/data/build/settings
index 0270c62f8..189b34a8d 100644
--- a/level_2/fll_iki/data/build/settings
+++ b/level_2/fll_iki/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_2
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_2/fll_path/data/build/settings b/level_2/fll_path/data/build/settings
index 6db7e8344..b0402ce49 100644
--- a/level_2/fll_path/data/build/settings
+++ b/level_2/fll_path/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_2
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_2/fll_print/data/build/settings b/level_2/fll_print/data/build/settings
index ccd7371b6..26d0b5b70 100644
--- a/level_2/fll_print/data/build/settings
+++ b/level_2/fll_print/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_2
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_2/fll_program/data/build/settings b/level_2/fll_program/data/build/settings
index 4b78cf201..adc6c7849 100644
--- a/level_2/fll_program/data/build/settings
+++ b/level_2/fll_program/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_2
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_2/fll_status_string/data/build/settings b/level_2/fll_status_string/data/build/settings
index bf881bf97..3ac6025d7 100644
--- a/level_2/fll_status_string/data/build/settings
+++ b/level_2/fll_status_string/data/build/settings
@@ -49,7 +49,7 @@ build_shared yes
 build_static no
 
 path_headers fll/level_2
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/byte_dump/data/build/settings b/level_3/byte_dump/data/build/settings
index d0e7f30ca..d6c21bedc 100644
--- a/level_3/byte_dump/data/build/settings
+++ b/level_3/byte_dump/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/byte_dump
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/control/data/build/settings b/level_3/control/data/build/settings
index e389194c1..fe71c2cb8 100644
--- a/level_3/control/data/build/settings
+++ b/level_3/control/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/control
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/controller/data/build/settings b/level_3/controller/data/build/settings
index d9004d8db..a70964d73 100644
--- a/level_3/controller/data/build/settings
+++ b/level_3/controller/data/build/settings
@@ -62,7 +62,7 @@ build_shared yes
 build_static no
 
 path_headers program/controller
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/fake/c/private-build-load.c b/level_3/fake/c/private-build-load.c
index d6b57e4c0..ef7d6e43b 100644
--- a/level_3/fake/c/private-build-load.c
+++ b/level_3/fake/c/private-build-load.c
@@ -201,7 +201,7 @@ extern "C" {
     f_string_dynamics_t build_sources_object_static = f_string_dynamics_t_initialize;
     f_string_dynamics_t build_static = f_string_dynamics_t_initialize;
     f_string_dynamics_t path_headers = f_string_dynamics_t_initialize;
-    f_string_dynamics_t path_headers_preserve = f_string_dynamics_t_initialize;
+    f_string_dynamics_t preserve_path_headers = f_string_dynamics_t_initialize;
     f_string_dynamics_t path_language = f_string_dynamics_t_initialize;
     f_string_dynamics_t path_library_script = f_string_dynamics_t_initialize;
     f_string_dynamics_t path_library_shared = f_string_dynamics_t_initialize;
@@ -291,7 +291,7 @@ extern "C" {
       fake_build_setting_name_modes_s,
       fake_build_setting_name_modes_default_s,
       fake_build_setting_name_path_headers_s,
-      fake_build_setting_name_path_headers_preserve_s,
+      fake_build_setting_name_preserve_path_headers_s,
       fake_build_setting_name_path_language_s,
       fake_build_setting_name_path_library_script_s,
       fake_build_setting_name_path_library_shared_s,
@@ -382,7 +382,7 @@ extern "C" {
       &setting->modes,
       &setting->modes_default,
       &path_headers,
-      &path_headers_preserve,
+      &preserve_path_headers,
       &path_language,
       &path_library_script,
       &path_library_shared,
@@ -661,7 +661,7 @@ extern "C" {
         fake_build_setting_name_build_sources_object_static_s,
         fake_build_setting_name_build_static_s,
         fake_build_setting_name_path_headers_s,
-        fake_build_setting_name_path_headers_preserve_s,
+        fake_build_setting_name_preserve_path_headers_s,
         fake_build_setting_name_path_language_s,
         fake_build_setting_name_path_library_script_s,
         fake_build_setting_name_path_library_shared_s,
@@ -704,7 +704,7 @@ extern "C" {
         &build_sources_object_static,
         &build_static,
         &path_headers,
-        &path_headers_preserve,
+        &preserve_path_headers,
         &path_language,
         &path_library_script,
         &path_library_shared,
@@ -747,7 +747,7 @@ extern "C" {
         0,                                           // build_sources_object_static
         &setting->build_static,                      // build_static
         0,                                           // path_headers
-        &setting->path_headers_preserve,             // path_headers_preserve
+        &setting->preserve_path_headers,             // preserve_path_headers
         0,                                           // path_language
         0,                                           // path_library_script
         0,                                           // path_library_shared
@@ -780,7 +780,7 @@ extern "C" {
         &setting->build_sources_object_static,       // build_sources_object_static
         0,                                           // build_static
         &setting->path_headers,                      // path_headers
-        0,                                           // path_headers_preserve
+        0,                                           // preserve_path_headers
         &setting->path_language,                     // path_language
         &setting->path_library_script,               // path_library_script
         &setting->path_library_shared,               // path_library_shared
@@ -823,7 +823,7 @@ extern "C" {
         f_string_empty_s,                            // build_sources_object_static
         f_string_empty_s,                            // build_static
         f_string_empty_s,                            // path_headers
-        f_string_empty_s,                            // path_headers_preserve
+        f_string_empty_s,                            // preserve_path_headers
         f_string_empty_s,                            // path_language
         fake_path_part_script_s,                     // path_library_script
         fake_path_part_shared_s,                     // path_library_shared
@@ -872,7 +872,7 @@ extern "C" {
         0,                                           // build_sources_object_static
         0,                                           // build_static
         0,                                           // path_headers
-        0,                                           // path_headers_preserve
+        0,                                           // preserve_path_headers
         0,                                           // path_language
         0,                                           // path_library_script
         0,                                           // path_library_shared
@@ -915,7 +915,7 @@ extern "C" {
         0,                                           // build_sources_object_static
         0,                                           // build_static
         0,                                           // path_headers
-        0,                                           // path_headers_preserve
+        0,                                           // preserve_path_headers
         0,                                           // path_language
         0,                                           // path_library_script
         0,                                           // path_library_shared
@@ -958,7 +958,7 @@ extern "C" {
         f_string_empty_s,                            // build_sources_object_static
         f_string_empty_s,                            // build_static
         f_string_empty_s,                            // path_headers
-        f_string_empty_s,                            // path_headers_preserve
+        f_string_empty_s,                            // preserve_path_headers
         f_string_empty_s,                            // path_language
         f_string_empty_s,                            // path_library_script
         f_string_empty_s,                            // path_library_shared
@@ -1002,7 +1002,7 @@ extern "C" {
         3,                                           // build_sources_object_static
         1,                                           // build_static
         2,                                           // path_headers
-        1,                                           // path_headers_preserve
+        1,                                           // preserve_path_headers
         2,                                           // path_language
         2,                                           // path_library_script
         2,                                           // path_library_shared
@@ -1267,7 +1267,7 @@ extern "C" {
     f_string_dynamics_resize(0, &build_sources_object_static);
     f_string_dynamics_resize(0, &build_static);
     f_string_dynamics_resize(0, &path_headers);
-    f_string_dynamics_resize(0, &path_headers_preserve);
+    f_string_dynamics_resize(0, &preserve_path_headers);
     f_string_dynamics_resize(0, &path_language);
     f_string_dynamics_resize(0, &path_library_script);
     f_string_dynamics_resize(0, &path_library_shared);
diff --git a/level_3/fake/c/private-build.c b/level_3/fake/c/private-build.c
index c12731bcf..3f832918f 100644
--- a/level_3/fake/c/private-build.c
+++ b/level_3/fake/c/private-build.c
@@ -344,7 +344,7 @@ extern "C" {
 #endif // _di_fake_build_arguments_standard_add_
 
 #ifndef _di_fake_build_copy_
-  void fake_build_copy(fake_main_t * const main, const f_mode_t mode, const f_string_static_t label, const f_string_static_t source, const f_string_static_t destination, const f_string_statics_t files, const f_string_static_t file_stage, const f_array_length_t preserve, f_status_t *status) {
+  void fake_build_copy(fake_main_t * const main, const f_mode_t mode, const f_string_static_t label, const f_string_static_t source, const f_string_static_t destination, const f_string_statics_t files, const f_string_static_t file_stage, const f_array_length_t perserve_offset, f_status_t *status) {
 
     if (F_status_is_error(*status) || f_file_exists(file_stage) == F_true || *status == F_child) return;
 
@@ -479,7 +479,7 @@ extern "C" {
           break;
         }
 
-        if (preserve && preserve < path_source.used) {
+        if (perserve_offset && perserve_offset < path_source.used) {
           *status = f_string_dynamic_append_nulless(destination, &destination_directory);
 
           if (F_status_is_error(*status)) {
@@ -488,8 +488,8 @@ extern "C" {
             break;
           }
 
-          buffer.string = path_source.string + preserve;
-          buffer.used = path_source.used - preserve;
+          buffer.string = path_source.string + perserve_offset;
+          buffer.used = path_source.used - perserve_offset;
 
           *status = f_file_name_directory(buffer, &destination_directory);
 
@@ -515,7 +515,7 @@ extern "C" {
             break;
           }
 
-          *status = f_string_append(path_source.string + preserve, path_source.used - preserve, &destination_file);
+          *status = f_string_append(path_source.string + perserve_offset, path_source.used - perserve_offset, &destination_file);
 
           if (F_status_is_error(*status)) {
             fll_error_print(main->error, F_status_set_fine(*status), "f_string_append", F_true);
@@ -942,14 +942,14 @@ extern "C" {
 
         path_headers_string[path_headers.used] = 0;
 
-        fake_build_copy(main, mode, fake_build_header_files_s, path_sources, path_headers, data_build.setting.build_sources_headers, stage.file_sources_headers, data_build.setting.path_headers_preserve ? path_headers.used : 0, &status);
+        fake_build_copy(main, mode, fake_build_header_files_s, path_sources, path_headers, data_build.setting.build_sources_headers, stage.file_sources_headers, data_build.setting.preserve_path_headers ? path_sources.used : 0, &status);
 
         if (data_build.setting.build_shared) {
-          fake_build_copy(main, mode, fake_build_header_files_shared_s, path_sources, path_headers, data_build.setting.build_sources_headers_shared, stage.file_sources_headers, data_build.setting.path_headers_preserve ? path_headers.used : 0, &status);
+          fake_build_copy(main, mode, fake_build_header_files_shared_s, path_sources, path_headers, data_build.setting.build_sources_headers_shared, stage.file_sources_headers, data_build.setting.preserve_path_headers ? path_sources.used : 0, &status);
         }
 
         if (data_build.setting.build_static) {
-          fake_build_copy(main, mode, fake_build_header_files_static_s, path_sources, path_headers, data_build.setting.build_sources_headers_static, stage.file_sources_headers, data_build.setting.path_headers_preserve ? path_headers.used : 0, &status);
+          fake_build_copy(main, mode, fake_build_header_files_static_s, path_sources, path_headers, data_build.setting.build_sources_headers_static, stage.file_sources_headers, data_build.setting.preserve_path_headers ? path_sources.used : 0, &status);
         }
       }
 
diff --git a/level_3/fake/c/private-build.h b/level_3/fake/c/private-build.h
index 732a9be61..c8b9b3822 100644
--- a/level_3/fake/c/private-build.h
+++ b/level_3/fake/c/private-build.h
@@ -88,7 +88,7 @@ extern "C" {
  *   The files to copy from source to destination.
  * @param file_stage
  *   The specific stage file path.
- * @param perserve
+ * @param perserve_offset
  *   When a positive number, this represents the amount of characters at the front of each file to ignore.
  *   Everything after that is preserved, and the directory is created if necessary.
  *
@@ -96,7 +96,7 @@ extern "C" {
  *   Set to 0 to disable.
  *
  *   Example: 'sources/c/level_0/fss.h' with a preseve of 10, would result in the path of 'level_0/fss.h' being preserved.
- *            Whereas a preserve of 0 would result in a path of 'fss.h' being used (the 'level_0/' directory is not preserved).
+ *            Whereas a perserve_offset of 0 would result in a path of 'fss.h' being used (the 'level_0/' directory is not preserved).
  * @param status
  *   The return status.
  *
@@ -106,7 +106,7 @@ extern "C" {
  *   Status codes (with error bit) are returned on any problem.
  */
 #ifndef _di_fake_build_copy_
-  extern void fake_build_copy(fake_main_t * const main, const f_mode_t mode, const f_string_static_t label, const f_string_static_t source, const f_string_static_t destination, const f_string_statics_t files, const f_string_static_t file_stage, const f_array_length_t preserve, f_status_t *status) F_attribute_visibility_internal_d;
+  extern void fake_build_copy(fake_main_t * const main, const f_mode_t mode, const f_string_static_t label, const f_string_static_t source, const f_string_static_t destination, const f_string_statics_t files, const f_string_static_t file_stage, const f_array_length_t perserve_offset, f_status_t *status) F_attribute_visibility_internal_d;
 #endif // _di_fake_build_copy_
 
 /**
diff --git a/level_3/fake/c/private-common.c b/level_3/fake/c/private-common.c
index 153ee77f4..6586f0600 100644
--- a/level_3/fake/c/private-common.c
+++ b/level_3/fake/c/private-common.c
@@ -72,7 +72,7 @@ extern "C" {
   const f_string_static_t fake_build_setting_name_modes_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_modes_s, 0, FAKE_build_setting_name_modes_s_length);
   const f_string_static_t fake_build_setting_name_modes_default_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_modes_default_s, 0, FAKE_build_setting_name_modes_default_s_length);
   const f_string_static_t fake_build_setting_name_path_headers_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_path_headers_s, 0, FAKE_build_setting_name_path_headers_s_length);
-  const f_string_static_t fake_build_setting_name_path_headers_preserve_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_path_headers_preserve_s, 0, FAKE_build_setting_name_path_headers_preserve_s_length);
+  const f_string_static_t fake_build_setting_name_preserve_path_headers_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_preserve_path_headers_s, 0, FAKE_build_setting_name_preserve_path_headers_s_length);
   const f_string_static_t fake_build_setting_name_path_language_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_path_language_s, 0, FAKE_build_setting_name_path_language_s_length);
   const f_string_static_t fake_build_setting_name_path_library_script_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_path_library_script_s, 0, FAKE_build_setting_name_path_library_script_s_length);
   const f_string_static_t fake_build_setting_name_path_library_shared_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_path_library_shared_s, 0, FAKE_build_setting_name_path_library_shared_s_length);
diff --git a/level_3/fake/c/private-common.h b/level_3/fake/c/private-common.h
index ca2a97bff..7a23dd0cb 100644
--- a/level_3/fake/c/private-common.h
+++ b/level_3/fake/c/private-common.h
@@ -24,7 +24,7 @@ extern "C" {
     bool build_static;
 
     bool path_standard;
-    bool path_headers_preserve;
+    bool preserve_path_headers;
 
     bool search_exclusive;
     bool search_shared;
@@ -345,7 +345,7 @@ extern "C" {
   #define FAKE_build_setting_name_modes_s                        "modes"
   #define FAKE_build_setting_name_modes_default_s                "modes_default"
   #define FAKE_build_setting_name_path_headers_s                 "path_headers"
-  #define FAKE_build_setting_name_path_headers_preserve_s        "path_headers_preserve"
+  #define FAKE_build_setting_name_preserve_path_headers_s        "preserve_path_headers"
   #define FAKE_build_setting_name_path_language_s                "path_language"
   #define FAKE_build_setting_name_path_library_script_s          "path_library_script"
   #define FAKE_build_setting_name_path_library_shared_s          "path_library_shared"
@@ -440,7 +440,7 @@ extern "C" {
   #define FAKE_build_setting_name_modes_s_length                        5
   #define FAKE_build_setting_name_modes_default_s_length                13
   #define FAKE_build_setting_name_path_headers_s_length                 12
-  #define FAKE_build_setting_name_path_headers_preserve_s_length        21
+  #define FAKE_build_setting_name_preserve_path_headers_s_length        21
   #define FAKE_build_setting_name_path_language_s_length                13
   #define FAKE_build_setting_name_path_library_script_s_length          19
   #define FAKE_build_setting_name_path_library_shared_s_length          19
@@ -535,7 +535,7 @@ extern "C" {
   extern const f_string_static_t fake_build_setting_name_modes_s;
   extern const f_string_static_t fake_build_setting_name_modes_default_s;
   extern const f_string_static_t fake_build_setting_name_path_headers_s;
-  extern const f_string_static_t fake_build_setting_name_path_headers_preserve_s;
+  extern const f_string_static_t fake_build_setting_name_preserve_path_headers_s;
   extern const f_string_static_t fake_build_setting_name_path_language_s;
   extern const f_string_static_t fake_build_setting_name_path_library_script_s;
   extern const f_string_static_t fake_build_setting_name_path_library_shared_s;
diff --git a/level_3/fake/data/build/settings b/level_3/fake/data/build/settings
index 596d730ea..32ad839a2 100644
--- a/level_3/fake/data/build/settings
+++ b/level_3/fake/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/fake
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/fake/documents/settings.txt b/level_3/fake/documents/settings.txt
index 8923da54a..7468da322 100644
--- a/level_3/fake/documents/settings.txt
+++ b/level_3/fake/documents/settings.txt
@@ -343,13 +343,7 @@ Settings Documentation:
     A sub-path in which headers are to be installed under.
     For example, the FLL project might use the "level_0", "level_1", etc.. headers without requiring that structure within the source.
     A resulting build destination for a path_headers of "level_0" would be something like "build/includes/level_0/".
-    If "path_headers" is "level_0", "path_headers_preserve" is "yes", and "build_sources_headers" has "xxx/a.h yyy/zzz/b.h", then the headers would be at: "build/includes/level_0/xxx/a.h build/includes/level_0/yyy/zzz/b.h"
-
-  - path_headers_preserve\:
-    When this is "yes", then the relative directory structure in the source (as defined in "build_sources_headers") is preserved.
-    If the "build_sources_headers" has the header files "xxx/a.h yyy/zzz/b.h" and this is "yes", then the directories "xxx/" and "yyy/zzz/" are created and the files are stored within them.
-    If the "build_sources_headers" has the header files "xxx/a.h yyy/zzz/b.h" and this is "no", then the directories "xxx/" and "yyy/zzz/" are stripped before installing.
-    When this is "no" and the "build_sources_headers" has header files "xxx/a.h yyy/a.h", then one of the "a.h" files will be overwritten, depending on order they were supplied.
+    If "path_headers" is "level_0", "preserve_path_headers" is "yes", and "build_sources_headers" has "xxx/a.h yyy/zzz/b.h", then the headers would be at: "build/includes/level_0/xxx/a.h build/includes/level_0/yyy/zzz/b.h"
 
   - path_language\:
     A sub-path in which to find the source files for the currently defined language.
@@ -421,6 +415,12 @@ Settings Documentation:
 
     This defaults to "yes".
 
+  - preserve_path_headers\:
+    When this is "yes", then the relative directory structure in the source (as defined in "build_sources_headers") is preserved.
+    If the "build_sources_headers" has the header files "xxx/a.h yyy/zzz/b.h" and this is "yes", then the directories "xxx/" and "yyy/zzz/" are created and the files are stored within them.
+    If the "build_sources_headers" has the header files "xxx/a.h yyy/zzz/b.h" and this is "no", then the directories "xxx/" and "yyy/zzz/" are stripped before installing.
+    When this is "no" and the "build_sources_headers" has header files "xxx/a.h yyy/a.h", then one of the "a.h" files will be overwritten, depending on order they were supplied.
+
   - process_post\:
     The filename (relative to the "data/build/" directory) of a script to execute after the "build" operation successfully completes.
     A small subset of parameters from the main execution are passed to this script during execution as parameters (using short parameter codes)\:
diff --git a/level_3/fake/specifications/settings.txt b/level_3/fake/specifications/settings.txt
index ec49da4ce..9a0aac50d 100644
--- a/level_3/fake/specifications/settings.txt
+++ b/level_3/fake/specifications/settings.txt
@@ -69,7 +69,6 @@ Settings Specification:
     - modes: Any valid word character, '-', or '+'.
     - modes_default: May only be a single complete Content word defined in "modes" Object.
     - path_headers: Must be a single valid path.
-    - path_headers_preserve: Must only be one of "yes" or "no".
     - path_language: Must be a single valid path.
     - path_library_script: Must be a single valid path.
     - path_library_shared: Must be a single valid path.
@@ -83,6 +82,7 @@ Settings Specification:
     - path_sources: Must only be a valid directory path or not specified.
     - path_sources_object: Must only be a valid directory path or not specified.
     - path_standard: Must only one of: "yes" or "no".
+    - preserve_path_headers: Must only be one of "yes" or "no".
     - process_post: Must contain only a single valid filename.
     - process_pre: Must contain only a single valid filename.
     - search_exclusive: Must only one of: "yes" or "no".
diff --git a/level_3/firewall/data/build/settings b/level_3/firewall/data/build/settings
index 7238e7f9b..eac7d39bc 100644
--- a/level_3/firewall/data/build/settings
+++ b/level_3/firewall/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/firewall
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/fss_basic_list_read/data/build/settings b/level_3/fss_basic_list_read/data/build/settings
index 93ac28e56..bcdea4a8c 100644
--- a/level_3/fss_basic_list_read/data/build/settings
+++ b/level_3/fss_basic_list_read/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/fss_basic_list_read
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/fss_basic_list_write/data/build/settings b/level_3/fss_basic_list_write/data/build/settings
index 4276cb223..e3a2a8356 100644
--- a/level_3/fss_basic_list_write/data/build/settings
+++ b/level_3/fss_basic_list_write/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/fss_basic_list_write
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/fss_basic_read/data/build/settings b/level_3/fss_basic_read/data/build/settings
index c878ddecd..01d36a26f 100644
--- a/level_3/fss_basic_read/data/build/settings
+++ b/level_3/fss_basic_read/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/fss_basic_read
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/fss_basic_write/data/build/settings b/level_3/fss_basic_write/data/build/settings
index 7305b81f3..245eeb571 100644
--- a/level_3/fss_basic_write/data/build/settings
+++ b/level_3/fss_basic_write/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/fss_basic_write
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/fss_embedded_list_read/data/build/settings b/level_3/fss_embedded_list_read/data/build/settings
index 0f9da3336..42aecb22a 100644
--- a/level_3/fss_embedded_list_read/data/build/settings
+++ b/level_3/fss_embedded_list_read/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/fss_embedded_list_read
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/fss_embedded_list_write/data/build/settings b/level_3/fss_embedded_list_write/data/build/settings
index 260eeb29f..bab59871d 100644
--- a/level_3/fss_embedded_list_write/data/build/settings
+++ b/level_3/fss_embedded_list_write/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/fss_embedded_list_write
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/fss_extended_list_read/data/build/settings b/level_3/fss_extended_list_read/data/build/settings
index 4b0271214..0b338f0a5 100644
--- a/level_3/fss_extended_list_read/data/build/settings
+++ b/level_3/fss_extended_list_read/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/fss_extended_list_read
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/fss_extended_list_write/data/build/settings b/level_3/fss_extended_list_write/data/build/settings
index 46a5de2f9..3f9ffd185 100644
--- a/level_3/fss_extended_list_write/data/build/settings
+++ b/level_3/fss_extended_list_write/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/fss_extended_list_write
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/fss_extended_read/data/build/settings b/level_3/fss_extended_read/data/build/settings
index b5a50972a..37823ef09 100644
--- a/level_3/fss_extended_read/data/build/settings
+++ b/level_3/fss_extended_read/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/fss_extended_read
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/fss_extended_write/data/build/settings b/level_3/fss_extended_write/data/build/settings
index 2fe5f6012..67f1bd048 100644
--- a/level_3/fss_extended_write/data/build/settings
+++ b/level_3/fss_extended_write/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/fss_extended_write
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/fss_identify/data/build/settings b/level_3/fss_identify/data/build/settings
index ca386cb41..24c5a89a4 100644
--- a/level_3/fss_identify/data/build/settings
+++ b/level_3/fss_identify/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/fss_identify
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/fss_payload_read/data/build/settings b/level_3/fss_payload_read/data/build/settings
index 05c0e6d16..75a61d4b8 100644
--- a/level_3/fss_payload_read/data/build/settings
+++ b/level_3/fss_payload_read/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/fss_payload_read
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/fss_payload_write/data/build/settings b/level_3/fss_payload_write/data/build/settings
index 996051dba..962a64003 100644
--- a/level_3/fss_payload_write/data/build/settings
+++ b/level_3/fss_payload_write/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/fss_payload_write
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/fss_status_code/data/build/settings b/level_3/fss_status_code/data/build/settings
index 69420a9d9..459c6dbb6 100644
--- a/level_3/fss_status_code/data/build/settings
+++ b/level_3/fss_status_code/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/fss_status_code
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/iki_read/data/build/settings b/level_3/iki_read/data/build/settings
index ee3ce6349..dac22ac41 100644
--- a/level_3/iki_read/data/build/settings
+++ b/level_3/iki_read/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/iki_read
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/iki_write/data/build/settings b/level_3/iki_write/data/build/settings
index 1cad94f52..c11a4fb83 100644
--- a/level_3/iki_write/data/build/settings
+++ b/level_3/iki_write/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/iki_write
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/status_code/data/build/settings b/level_3/status_code/data/build/settings
index cd13564ed..be29b7986 100644
--- a/level_3/status_code/data/build/settings
+++ b/level_3/status_code/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/status_code
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
diff --git a/level_3/utf8/data/build/settings b/level_3/utf8/data/build/settings
index fbfff99f7..b195a8e20 100644
--- a/level_3/utf8/data/build/settings
+++ b/level_3/utf8/data/build/settings
@@ -51,7 +51,7 @@ build_shared yes
 build_static no
 
 path_headers program/utf8
-path_headers_preserve no
+preserve_path_headers no
 path_library_script script
 path_library_shared shared
 path_library_static static
-- 
2.47.3