From: Kevin Day <thekevinday@gmail.com>
Date: Wed, 28 Apr 2021 00:03:47 +0000 (-0500)
Subject: Cleanup: rename program data delete functions.
X-Git-Tag: 0.5.3~11
X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=c988e17852b000b5303d2abe006ac9acd24cba68;p=fll

Cleanup: rename program data delete functions.

Previously the style was to have "action" and then "data".
The new approach is to completely represent the name and then display the "action".

Thus byte_dump_delete_data() becomes byte_dump_data_delete() because the data structure is called "byte_dump_data_t".
---

diff --git a/level_3/byte_dump/c/byte_dump.c b/level_3/byte_dump/c/byte_dump.c
index 837c34a..cc618d3 100644
--- a/level_3/byte_dump/c/byte_dump.c
+++ b/level_3/byte_dump/c/byte_dump.c
@@ -110,7 +110,7 @@ extern "C" {
         if (F_status_is_error(status)) {
           fll_error_print(data->error, F_status_set_fine(status), "f_console_parameter_prioritize_right", F_true);
 
-          byte_dump_delete_data(data);
+          byte_dump_data_delete(data);
           return F_status_set_error(status);
         }
       }
@@ -126,7 +126,7 @@ extern "C" {
         if (F_status_is_error(status)) {
           fll_error_print(data->error, F_status_set_fine(status), "f_console_parameter_prioritize_right", F_true);
 
-          byte_dump_delete_data(data);
+          byte_dump_data_delete(data);
           return status;
         }
 
@@ -155,7 +155,7 @@ extern "C" {
         if (F_status_is_error(status)) {
           fll_error_print(data->error, F_status_set_fine(status), "f_console_parameter_prioritize_right", F_true);
 
-          byte_dump_delete_data(data);
+          byte_dump_data_delete(data);
           return F_status_set_error(status);
         }
 
@@ -187,7 +187,7 @@ extern "C" {
         if (F_status_is_error(status)) {
           fll_error_print(data->error, F_status_set_fine(status), "f_console_parameter_prioritize_right", F_true);
 
-          byte_dump_delete_data(data);
+          byte_dump_data_delete(data);
           return F_status_set_error(status);
         }
 
@@ -208,14 +208,14 @@ extern "C" {
     if (data->parameters[byte_dump_parameter_help].result == f_console_result_found) {
       byte_dump_print_help(data->output, data->context);
 
-      byte_dump_delete_data(data);
+      byte_dump_data_delete(data);
       return F_none;
     }
 
     if (data->parameters[byte_dump_parameter_version].result == f_console_result_found) {
       fll_program_print_version(data->output, byte_dump_version);
 
-      byte_dump_delete_data(data);
+      byte_dump_data_delete(data);
       return F_none;
     }
 
@@ -225,7 +225,7 @@ extern "C" {
         f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_width);
         f_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]);
 
-        byte_dump_delete_data(data);
+        byte_dump_data_delete(data);
         return F_status_set_error(status);
       }
       else if (data->parameters[byte_dump_parameter_width].result == f_console_result_additional) {
@@ -245,7 +245,7 @@ extern "C" {
           f_color_print(data->error.to.stream, data->context.set.notable, "251");
           f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]);
 
-          byte_dump_delete_data(data);
+          byte_dump_data_delete(data);
           return F_status_set_error(status);
         }
 
@@ -257,7 +257,7 @@ extern "C" {
         f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_first);
         f_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]);
 
-        byte_dump_delete_data(data);
+        byte_dump_data_delete(data);
         return F_status_set_error(status);
       }
       else if (data->parameters[byte_dump_parameter_first].result == f_console_result_additional) {
@@ -277,7 +277,7 @@ extern "C" {
           f_color_print(data->error.to.stream, data->context.set.notable, "%llu", f_number_t_size_unsigned);
           f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]);
 
-          byte_dump_delete_data(data);
+          byte_dump_data_delete(data);
           return F_status_set_error(status);
         }
 
@@ -289,7 +289,7 @@ extern "C" {
         f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_last);
         f_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]);
 
-        byte_dump_delete_data(data);
+        byte_dump_data_delete(data);
         return F_status_set_error(status);
       }
       else if (data->parameters[byte_dump_parameter_last].result == f_console_result_additional) {
@@ -309,7 +309,7 @@ extern "C" {
           f_color_print(data->error.to.stream, data->context.set.notable, "%llu", f_number_t_size_unsigned);
           f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]);
 
-          byte_dump_delete_data(data);
+          byte_dump_data_delete(data);
           return F_status_set_error(status);
         }
 
@@ -324,7 +324,7 @@ extern "C" {
           f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_last);
           f_color_print(data->error.to.stream, data->context.set.error, "' value.%c", f_string_eol_s[0]);
 
-          byte_dump_delete_data(data);
+          byte_dump_data_delete(data);
           return F_status_set_error(status);
         }
 
@@ -363,7 +363,7 @@ extern "C" {
         if (F_status_is_error(status)) {
           fll_error_print(data->error, F_status_set_fine(status), "byte_dump_file", F_true);
 
-          byte_dump_delete_data(data);
+          byte_dump_data_delete(data);
           return status;
         }
       }
@@ -389,7 +389,7 @@ extern "C" {
           if (missing_files != F_none) {
             status = F_status_set_error(missing_files);
 
-            byte_dump_delete_data(data);
+            byte_dump_data_delete(data);
             return status;
           }
         }
@@ -403,7 +403,7 @@ extern "C" {
           if (F_status_is_error(status)) {
             fll_error_file_print(data->error, F_status_set_fine(status), "f_file_open", F_true, arguments.argv[data->remaining.array[counter]], "open", fll_error_file_type_file);
 
-            byte_dump_delete_data(data);
+            byte_dump_data_delete(data);
             return status;
           }
 
@@ -437,7 +437,7 @@ extern "C" {
           if (F_status_is_error(status)) {
             fll_error_file_print(data->error, F_status_set_fine(status), "byte_dump_file", F_true, arguments.argv[data->remaining.array[counter]], "process", fll_error_file_type_file);
 
-            byte_dump_delete_data(data);
+            byte_dump_data_delete(data);
             return status;
           }
         } // for
@@ -451,13 +451,13 @@ extern "C" {
       status = F_status_set_error(F_parameter);
     }
 
-    byte_dump_delete_data(data);
+    byte_dump_data_delete(data);
     return status;
   }
 #endif // _di_byte_dump_main_
 
-#ifndef _di_byte_dump_delete_data_
-  f_status_t byte_dump_delete_data(byte_dump_data_t *data) {
+#ifndef _di_byte_dump_data_delete_
+  f_status_t byte_dump_data_delete(byte_dump_data_t *data) {
 
     for (f_array_length_t i = 0; i < byte_dump_total_parameters; i++) {
       f_macro_array_lengths_t_delete_simple(data->parameters[i].locations);
@@ -471,7 +471,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_byte_dump_delete_data_
+#endif // _di_byte_dump_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/byte_dump/c/byte_dump.h b/level_3/byte_dump/c/byte_dump.h
index 484daf0..603c10c 100644
--- a/level_3/byte_dump/c/byte_dump.h
+++ b/level_3/byte_dump/c/byte_dump.h
@@ -260,7 +260,7 @@ extern "C" {
 /**
  * Execute main program.
  *
- * Be sure to call byte_dump_delete_data() after executing this.
+ * Be sure to call byte_dump_data_delete() after executing this.
  *
  * @param arguments
  *   The parameters passed to the process.
@@ -271,7 +271,7 @@ extern "C" {
  *   F_none on success.
  *   Status codes (with error bit) are returned on any problem.
  *
- * @see byte_dump_delete_data()
+ * @see byte_dump_data_delete()
  */
 #ifndef _di_byte_dump_main_
   extern f_status_t byte_dump_main(const f_console_arguments_t arguments, byte_dump_data_t *data);
@@ -292,9 +292,9 @@ extern "C" {
  *
  * @see byte_dump_main()
  */
-#ifndef _di_byte_dump_delete_data_
-  extern f_status_t byte_dump_delete_data(byte_dump_data_t *data);
-#endif // _di_byte_dump_delete_data_
+#ifndef _di_byte_dump_data_delete_
+  extern f_status_t byte_dump_data_delete(byte_dump_data_t *data);
+#endif // _di_byte_dump_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/control/c/control.c b/level_3/control/c/control.c
index 843bf8c..0d1d11a 100644
--- a/level_3/control/c/control.c
+++ b/level_3/control/c/control.c
@@ -69,7 +69,7 @@ extern "C" {
             fprintf(data->error.to.stream, "%c", f_string_eol_s[0]);
           }
 
-          control_delete_data(data);
+          control_data_delete(data);
           return F_status_set_error(status);
         }
       }
@@ -83,7 +83,7 @@ extern "C" {
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
         if (F_status_is_error(status)) {
-          control_delete_data(data);
+          control_data_delete(data);
           return status;
         }
 
@@ -107,14 +107,14 @@ extern "C" {
     if (data->parameters[control_parameter_help].result == f_console_result_found) {
       control_print_help(data->output, data->context);
 
-      control_delete_data(data);
+      control_data_delete(data);
       return F_none;
     }
 
     if (data->parameters[control_parameter_version].result == f_console_result_found) {
       fll_program_print_version(data->output, control_version);
 
-      control_delete_data(data);
+      control_data_delete(data);
       return F_none;
     }
 
@@ -127,13 +127,13 @@ extern "C" {
       }
     }
 
-    control_delete_data(data);
+    control_data_delete(data);
     return status;
   }
 #endif // _di_control_main_
 
-#ifndef _di_control_delete_data_
-  f_status_t control_delete_data(control_data_t *data) {
+#ifndef _di_control_data_delete_
+  f_status_t control_data_delete(control_data_t *data) {
 
     for (f_array_length_t i = 0; i < control_total_parameters; i++) {
       f_macro_array_lengths_t_delete_simple(data->parameters[i].locations);
@@ -147,7 +147,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_control_delete_data_
+#endif // _di_control_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/control/c/control.h b/level_3/control/c/control.h
index 1ffca5d..9085b1f 100644
--- a/level_3/control/c/control.h
+++ b/level_3/control/c/control.h
@@ -126,7 +126,7 @@ extern "C" {
 /**
  * Execute main program.
  *
- * Be sure to call control_delete_data() after executing this.
+ * Be sure to call control_data_delete() after executing this.
  *
  * @param arguments
  *   The parameters passed to the process.
@@ -138,7 +138,7 @@ extern "C" {
  *
  *   Status codes (with error bit) are returned on any problem.
  *
- * @see control_delete_data()
+ * @see control_data_delete()
  */
 #ifndef _di_control_main_
   extern f_status_t control_main(const f_console_arguments_t arguments, control_data_t *data);
@@ -159,9 +159,9 @@ extern "C" {
  *
  * @see control_main()
  */
-#ifndef _di_control_delete_data_
-  extern f_status_t control_delete_data(control_data_t *data);
-#endif // _di_control_delete_data_
+#ifndef _di_control_data_delete_
+  extern f_status_t control_data_delete(control_data_t *data);
+#endif // _di_control_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fake/c/fake.c b/level_3/fake/c/fake.c
index 491ada8..66ccaab 100644
--- a/level_3/fake/c/fake.c
+++ b/level_3/fake/c/fake.c
@@ -133,7 +133,7 @@ extern "C" {
         if (F_status_is_error(status)) {
           fll_error_print(data->error, F_status_set_fine(status), "fll_program_parameter_process", F_true);
 
-          fake_delete_data(data);
+          fake_data_delete(data);
           return status;
         }
       }
@@ -149,7 +149,7 @@ extern "C" {
         if (F_status_is_error(status)) {
           fll_error_print(data->error, F_status_set_fine(status), "f_console_parameter_prioritize_right", F_true);
 
-          fake_delete_data(data);
+          fake_data_delete(data);
           return status;
         }
 
@@ -255,14 +255,14 @@ extern "C" {
     if (data->parameters[fake_parameter_help].result == f_console_result_found) {
       fake_print_help(data->output, data->context);
 
-      fake_delete_data(data);
+      fake_data_delete(data);
       return F_none;
     }
 
     if (data->parameters[fake_parameter_version].result == f_console_result_found) {
       fll_program_print_version(data->output, fake_version);
 
-      fake_delete_data(data);
+      fake_data_delete(data);
       return F_none;
     }
 
@@ -276,7 +276,7 @@ extern "C" {
       }
 
       if (F_status_is_error(status)) {
-        fake_delete_data(data);
+        fake_data_delete(data);
         return F_status_set_error(status);
       }
 
@@ -371,13 +371,13 @@ extern "C" {
       status = F_status_set_error(F_parameter);
     }
 
-    fake_delete_data(data);
+    fake_data_delete(data);
     return status;
   }
 #endif // _di_fake_main_
 
-#ifndef _di_fake_delete_data_
-  f_status_t fake_delete_data(fake_data_t *data) {
+#ifndef _di_fake_data_delete_
+  f_status_t fake_data_delete(fake_data_t *data) {
 
     for (f_array_length_t i = 0; i < fake_total_parameters; i++) {
       f_macro_array_lengths_t_delete_simple(data->parameters[i].locations);
@@ -446,7 +446,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_fake_delete_data_
+#endif // _di_fake_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fake/c/fake.h b/level_3/fake/c/fake.h
index acc7e43..0d5c342 100644
--- a/level_3/fake/c/fake.h
+++ b/level_3/fake/c/fake.h
@@ -517,7 +517,7 @@ extern "C" {
 /**
  * Execute main program.
  *
- * Be sure to call fake_delete_data() after executing this.
+ * Be sure to call fake_data_delete() after executing this.
  *
  * If data.signal is non-zero, then this blocks and handles the following signals:
  * - F_signal_abort
@@ -537,7 +537,7 @@ extern "C" {
  *
  *   Status codes (with error bit) are returned on any problem.
  *
- * @see fake_delete_data()
+ * @see fake_data_delete()
  */
 #ifndef _di_fake_main_
   extern f_status_t fake_main(const f_console_arguments_t arguments, fake_data_t *data);
@@ -558,9 +558,9 @@ extern "C" {
  *
  * @see fake_main()
  */
-#ifndef _di_fake_delete_data_
-  extern f_status_t fake_delete_data(fake_data_t *data);
-#endif // _di_fake_delete_data_
+#ifndef _di_fake_data_delete_
+  extern f_status_t fake_data_delete(fake_data_t *data);
+#endif // _di_fake_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/firewall/c/firewall.c b/level_3/firewall/c/firewall.c
index db91199..b7390b5 100644
--- a/level_3/firewall/c/firewall.c
+++ b/level_3/firewall/c/firewall.c
@@ -87,7 +87,7 @@ extern "C" {
         }
 
         if (F_status_is_error(status)) {
-          firewall_delete_data(data);
+          firewall_data_delete(data);
           return F_status_set_error(status);
         }
       }
@@ -101,7 +101,7 @@ extern "C" {
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
         if (F_status_is_error(status)) {
-          firewall_delete_data(data);
+          firewall_data_delete(data);
           return status;
         }
 
@@ -125,14 +125,14 @@ extern "C" {
     if (data->parameters[firewall_parameter_help].result == f_console_result_found) {
       firewall_print_help(data->output, data->context);
 
-      firewall_delete_data(data);
+      firewall_data_delete(data);
       return F_none;
     }
 
     if (data->parameters[firewall_parameter_version].result == f_console_result_found) {
       fll_program_print_version(data->output, firewall_version);
 
-      firewall_delete_data(data);
+      firewall_data_delete(data);
       return F_none;
     }
 
@@ -240,7 +240,7 @@ extern "C" {
         if (F_status_is_error(status)) {
           f_color_print(data->error.to.stream, data->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]);
           firewall_delete_local_data(&local);
-          firewall_delete_data(data);
+          firewall_data_delete(data);
           return status;
         }
 
@@ -382,7 +382,7 @@ extern "C" {
 
         f_macro_string_dynamics_t_delete_simple( parameters);
         firewall_delete_local_data(&local);
-        firewall_delete_data(data);
+        firewall_data_delete(data);
         return status;
       }
 
@@ -403,7 +403,7 @@ extern "C" {
         }
 
         firewall_delete_local_data(&local);
-        firewall_delete_data(data);
+        firewall_data_delete(data);
         return F_status_set_error(status);
       }
 
@@ -431,7 +431,7 @@ extern "C" {
 
         if (F_status_is_error(status)) {
           firewall_delete_local_data(&local);
-          firewall_delete_data(data);
+          firewall_data_delete(data);
           return status;
         }
 
@@ -463,7 +463,7 @@ extern "C" {
 
             if (F_status_is_error(status)) {
               firewall_delete_local_data(&local);
-              firewall_delete_data(data);
+              firewall_data_delete(data);
               return status;
             }
 
@@ -478,14 +478,14 @@ extern "C" {
             status = firewall_process_rules(&input, &local, data);
 
             firewall_delete_local_data(&local);
-            firewall_delete_data(data);
+            firewall_data_delete(data);
             return status;
           }
           else {
             f_color_print(data->error.to.stream, data->context.set.error, "%sFailed to perform lock request because the lock instructions are missing from: %s.%c", fll_error_print_error, network_path firewall_file_other, f_string_eol_s[0]);
 
             firewall_delete_local_data(&local);
-            firewall_delete_data(data);
+            firewall_data_delete(data);
             return F_status_set_error(F_data);
           }
         }
@@ -500,7 +500,7 @@ extern "C" {
 
             if (F_status_is_error(status)) {
               firewall_delete_local_data(&local);
-              firewall_delete_data(data);
+              firewall_data_delete(data);
               return status;
             }
 
@@ -517,7 +517,7 @@ extern "C" {
 
             if (F_status_is_error(status) || command == firewall_parameter_command_stop) {
               firewall_delete_local_data(&local);
-              firewall_delete_data(data);
+              firewall_data_delete(data);
               return status;
             }
           }
@@ -525,7 +525,7 @@ extern "C" {
             f_color_print(data->error.to.stream, data->context.set.error, "%sFailed to perform stop request because the lock instructions are missing from: %s.", fll_error_print_error, network_path firewall_file_other, f_string_eol_s[0]);
 
             firewall_delete_local_data(&local);
-            firewall_delete_data(data);
+            firewall_data_delete(data);
             return F_status_set_error(F_data);
           }
         }
@@ -538,7 +538,7 @@ extern "C" {
 
         if (F_status_is_error(status)) {
           firewall_delete_local_data(&local);
-          firewall_delete_data(data);
+          firewall_data_delete(data);
           return status;
         }
 
@@ -551,7 +551,7 @@ extern "C" {
 
           if (F_status_is_error(status)) {
             firewall_delete_local_data(&local);
-            firewall_delete_data(data);
+            firewall_data_delete(data);
             return status;
           }
         }
@@ -560,7 +560,7 @@ extern "C" {
 
         if (F_status_is_error(status)) {
           firewall_delete_local_data(&local);
-          firewall_delete_data(data);
+          firewall_data_delete(data);
           return status;
         }
 
@@ -582,7 +582,7 @@ extern "C" {
 
           if (F_status_is_error(status) || command == firewall_parameter_command_stop) {
             firewall_delete_local_data(&local);
-            firewall_delete_data(data);
+            firewall_data_delete(data);
             return status;
           }
 
@@ -602,7 +602,7 @@ extern "C" {
             if (F_status_is_error(status)) {
               f_color_print(data->error.to.stream, data->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]);
               firewall_delete_local_data(&local);
-              firewall_delete_data(data);
+              firewall_data_delete(data);
               return status;
             }
 
@@ -628,7 +628,7 @@ extern "C" {
               continue;
             }
 
-            firewall_delete_data(data);
+            firewall_data_delete(data);
             return F_status_set_error(status);
           }
 
@@ -636,7 +636,7 @@ extern "C" {
 
           if (F_status_is_error(status)) {
             firewall_delete_local_data(&local);
-            firewall_delete_data(data);
+            firewall_data_delete(data);
             return status;
           }
 
@@ -658,7 +658,7 @@ extern "C" {
 
             if (F_status_is_error(status) || command == firewall_parameter_command_stop) {
               firewall_delete_local_data(&local);
-              firewall_delete_data(data);
+              firewall_data_delete(data);
               return status;
             }
           } // for
@@ -670,7 +670,7 @@ extern "C" {
 
         if (F_status_is_error(status)) {
           firewall_delete_local_data(&local);
-          firewall_delete_data(data);
+          firewall_data_delete(data);
           return status;
         }
 
@@ -680,7 +680,7 @@ extern "C" {
           f_status_t status2 = F_none;
 
           firewall_macro_delete_fss_buffers(status2, local.buffer, local.chain_objects, local.chain_contents)
-          firewall_delete_data(data);
+          firewall_data_delete(data);
           return status;
         }
 
@@ -702,7 +702,7 @@ extern "C" {
 
           if (F_status_is_error(status) || command == firewall_parameter_command_stop) {
             firewall_delete_local_data(&local);
-            firewall_delete_data(data);
+            firewall_data_delete(data);
             return status;
           }
 
@@ -718,13 +718,13 @@ extern "C" {
       status = F_status_set_error(F_parameter);
     }
 
-    firewall_delete_data(data);
+    firewall_data_delete(data);
     return status;
   }
 #endif // _di_firewall_main_
 
-#ifndef _di_firewall_delete_data_
-  f_status_t firewall_delete_data(firewall_data_t *data) {
+#ifndef _di_firewall_data_delete_
+  f_status_t firewall_data_delete(firewall_data_t *data) {
 
     for (f_array_length_t i = 0; i < firewall_total_parameters; i++) {
       f_macro_array_lengths_t_delete_simple(data->parameters[i].locations);
@@ -740,7 +740,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_firewall_delete_data_
+#endif // _di_firewall_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/firewall/c/firewall.h b/level_3/firewall/c/firewall.h
index ad5afc0..1655e80 100644
--- a/level_3/firewall/c/firewall.h
+++ b/level_3/firewall/c/firewall.h
@@ -311,7 +311,7 @@ extern "C" {
 /**
  * Execute main program.
  *
- * Be sure to call firewall_delete_data() after executing this.
+ * Be sure to call firewall_data_delete() after executing this.
  *
  * @param arguments
  *   The parameters passed to the process.
@@ -323,7 +323,7 @@ extern "C" {
  *
  *   Status codes (with error bit) are returned on any problem.
  *
- * @see firewall_delete_data()
+ * @see firewall_data_delete()
  */
 #ifndef _di_firewall_main_
   extern f_status_t firewall_main(const f_console_arguments_t arguments, firewall_data_t *data);
@@ -344,9 +344,9 @@ extern "C" {
  *
  * @see firewall_main()
  */
-#ifndef _di_firewall_delete_data_
-  extern f_status_t firewall_delete_data(firewall_data_t *data);
-#endif // _di_firewall_delete_data_
+#ifndef _di_firewall_data_delete_
+  extern f_status_t firewall_data_delete(firewall_data_t *data);
+#endif // _di_firewall_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_basic_list_read/c/fss_basic_list_read.c b/level_3/fss_basic_list_read/c/fss_basic_list_read.c
index 661f15b..acfcbb1 100644
--- a/level_3/fss_basic_list_read/c/fss_basic_list_read.c
+++ b/level_3/fss_basic_list_read/c/fss_basic_list_read.c
@@ -190,7 +190,7 @@ extern "C" {
         }
 
         if (F_status_is_error(status)) {
-          fss_basic_list_read_delete_data(data);
+          fss_basic_list_read_data_delete(data);
           return F_status_set_error(status);
         }
       }
@@ -204,7 +204,7 @@ extern "C" {
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
         if (F_status_is_error(status)) {
-          fss_basic_list_read_delete_data(data);
+          fss_basic_list_read_data_delete(data);
           return status;
         }
 
@@ -228,14 +228,14 @@ extern "C" {
     if (data->parameters[fss_basic_list_read_parameter_help].result == f_console_result_found) {
       fss_basic_list_read_print_help(data->output, data->context);
 
-      fss_basic_list_read_delete_data(data);
+      fss_basic_list_read_data_delete(data);
       return status;
     }
 
     if (data->parameters[fss_basic_list_read_parameter_version].result == f_console_result_found) {
       fll_program_print_version(data->output, fss_basic_list_read_version);
 
-      fss_basic_list_read_delete_data(data);
+      fss_basic_list_read_data_delete(data);
       return status;
     }
 
@@ -422,7 +422,7 @@ extern "C" {
           fprintf(data->output.stream, "0%c", f_string_eol_s[0]);
         }
 
-        fss_basic_list_read_delete_data(data);
+        fss_basic_list_read_data_delete(data);
         return F_none;
       }
 
@@ -530,13 +530,13 @@ extern "C" {
       status = F_status_set_error(F_parameter);
     }
 
-    fss_basic_list_read_delete_data(data);
+    fss_basic_list_read_data_delete(data);
     return status;
   }
 #endif // _di_fss_basic_list_read_main_
 
-#ifndef _di_fss_basic_list_read_delete_data_
-  f_status_t fss_basic_list_read_delete_data(fss_basic_list_read_data_t *data) {
+#ifndef _di_fss_basic_list_read_data_delete_
+  f_status_t fss_basic_list_read_data_delete(fss_basic_list_read_data_t *data) {
 
     for (f_array_length_t i = 0; i < fss_basic_list_read_total_parameters; i++) {
       f_macro_array_lengths_t_delete_simple(data->parameters[i].locations);
@@ -553,7 +553,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_fss_basic_list_read_delete_data_
+#endif // _di_fss_basic_list_read_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_basic_list_read/c/fss_basic_list_read.h b/level_3/fss_basic_list_read/c/fss_basic_list_read.h
index 9621451..792cd5c 100644
--- a/level_3/fss_basic_list_read/c/fss_basic_list_read.h
+++ b/level_3/fss_basic_list_read/c/fss_basic_list_read.h
@@ -221,7 +221,7 @@ extern "C" {
 /**
  * Execute main program.
  *
- * Be sure to call fss_basic_list_read_delete_data() after executing this.
+ * Be sure to call fss_basic_list_read_data_delete() after executing this.
  *
  * @param arguments
  *   The parameters passed to the process.
@@ -233,7 +233,7 @@ extern "C" {
  *
  *   Status codes (with error bit) are returned on any problem.
  *
- * @see fss_basic_list_read_delete_data()
+ * @see fss_basic_list_read_data_delete()
  */
 #ifndef _di_fss_basic_list_read_main_
   extern f_status_t fss_basic_list_read_main(const f_console_arguments_t arguments, fss_basic_list_read_data_t *data);
@@ -254,9 +254,9 @@ extern "C" {
  *
  * @see fss_basic_list_read_main()
  */
-#ifndef _di_fss_basic_list_read_delete_data_
-  extern f_status_t fss_basic_list_read_delete_data(fss_basic_list_read_data_t *data);
-#endif // _di_fss_basic_list_read_delete_data_
+#ifndef _di_fss_basic_list_read_data_delete_
+  extern f_status_t fss_basic_list_read_data_delete(fss_basic_list_read_data_t *data);
+#endif // _di_fss_basic_list_read_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_basic_list_write/c/fss_basic_list_write.c b/level_3/fss_basic_list_write/c/fss_basic_list_write.c
index 0aff3b0..cd96020 100644
--- a/level_3/fss_basic_list_write/c/fss_basic_list_write.c
+++ b/level_3/fss_basic_list_write/c/fss_basic_list_write.c
@@ -117,7 +117,7 @@ extern "C" {
         }
 
         if (F_status_is_error(status)) {
-          fss_basic_list_write_delete_data(data);
+          fss_basic_list_write_data_delete(data);
           return F_status_set_error(status);
         }
       }
@@ -131,7 +131,7 @@ extern "C" {
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
         if (F_status_is_error(status)) {
-          fss_basic_list_write_delete_data(data);
+          fss_basic_list_write_data_delete(data);
           return status;
         }
 
@@ -155,14 +155,14 @@ extern "C" {
     if (data->parameters[fss_basic_list_write_parameter_help].result == f_console_result_found) {
       fss_basic_list_write_print_help(data->output, data->context);
 
-      fss_basic_list_write_delete_data(data);
+      fss_basic_list_write_data_delete(data);
       return status;
     }
 
     if (data->parameters[fss_basic_list_write_parameter_version].result == f_console_result_found) {
       fll_program_print_version(data->output, fss_basic_list_write_version);
 
-      fss_basic_list_write_delete_data(data);
+      fss_basic_list_write_data_delete(data);
       return status;
     }
 
@@ -500,13 +500,13 @@ extern "C" {
     f_macro_string_dynamic_t_delete_simple(buffer);
     f_macro_string_dynamic_t_delete_simple(object);
     f_macro_string_dynamic_t_delete_simple(content);
-    fss_basic_list_write_delete_data(data);
+    fss_basic_list_write_data_delete(data);
     return status;
   }
 #endif // _di_fss_basic_list_write_main_
 
-#ifndef _di_fss_basic_list_write_delete_data_
-  f_status_t fss_basic_list_write_delete_data(fss_basic_list_write_data_t *data) {
+#ifndef _di_fss_basic_list_write_data_delete_
+  f_status_t fss_basic_list_write_data_delete(fss_basic_list_write_data_t *data) {
 
     for (f_array_length_t i = 0; i < fss_basic_list_write_total_parameters; i++) {
       f_macro_array_lengths_t_delete_simple(data->parameters[i].locations);
@@ -520,7 +520,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_fss_basic_list_write_delete_data_
+#endif // _di_fss_basic_list_write_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_basic_list_write/c/fss_basic_list_write.h b/level_3/fss_basic_list_write/c/fss_basic_list_write.h
index a000a00..81cf574 100644
--- a/level_3/fss_basic_list_write/c/fss_basic_list_write.h
+++ b/level_3/fss_basic_list_write/c/fss_basic_list_write.h
@@ -170,7 +170,7 @@ extern "C" {
 /**
  * Execute main program.
  *
- * Be sure to call fss_basic_list_write_delete_data() after executing this.
+ * Be sure to call fss_basic_list_write_data_delete() after executing this.
  *
  * @param arguments
  *   The parameters passed to the process.
@@ -182,7 +182,7 @@ extern "C" {
  *
  *   Status codes (with error bit) are returned on any problem.
  *
- * @see fss_basic_list_write_delete_data()
+ * @see fss_basic_list_write_data_delete()
  */
 #ifndef _di_fss_basic_list_write_main_
   extern f_status_t fss_basic_list_write_main(const f_console_arguments_t arguments, fss_basic_list_write_data_t *data);
@@ -203,9 +203,9 @@ extern "C" {
  *
  * @see fss_basic_list_write_main()
  */
-#ifndef _di_fss_basic_list_write_delete_data_
-  extern f_status_t fss_basic_list_write_delete_data(fss_basic_list_write_data_t *data);
-#endif // _di_fss_basic_list_write_delete_data_
+#ifndef _di_fss_basic_list_write_data_delete_
+  extern f_status_t fss_basic_list_write_data_delete(fss_basic_list_write_data_t *data);
+#endif // _di_fss_basic_list_write_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_basic_read/c/fss_basic_read.c b/level_3/fss_basic_read/c/fss_basic_read.c
index 5d6c04a..b37cf33 100644
--- a/level_3/fss_basic_read/c/fss_basic_read.c
+++ b/level_3/fss_basic_read/c/fss_basic_read.c
@@ -190,7 +190,7 @@ extern "C" {
         }
 
         if (F_status_is_error(status)) {
-          fss_basic_read_delete_data(data);
+          fss_basic_read_data_delete(data);
           return F_status_set_error(status);
         }
       }
@@ -204,7 +204,7 @@ extern "C" {
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
         if (F_status_is_error(status)) {
-          fss_basic_read_delete_data(data);
+          fss_basic_read_data_delete(data);
           return status;
         }
 
@@ -228,14 +228,14 @@ extern "C" {
     if (data->parameters[fss_basic_read_parameter_help].result == f_console_result_found) {
       fss_basic_read_print_help(data->output, data->context);
 
-      fss_basic_read_delete_data(data);
+      fss_basic_read_data_delete(data);
       return status;
     }
 
     if (data->parameters[fss_basic_read_parameter_version].result == f_console_result_found) {
       fll_program_print_version(data->output, fss_basic_read_version);
 
-      fss_basic_read_delete_data(data);
+      fss_basic_read_data_delete(data);
       return status;
     }
 
@@ -420,7 +420,7 @@ extern "C" {
           fprintf(data->output.stream, "0%c", f_string_eol_s[0]);
         }
 
-        fss_basic_read_delete_data(data);
+        fss_basic_read_data_delete(data);
         return F_none;
       }
 
@@ -528,13 +528,13 @@ extern "C" {
       status = F_status_set_error(F_parameter);
     }
 
-    fss_basic_read_delete_data(data);
+    fss_basic_read_data_delete(data);
     return status;
   }
 #endif // _di_fss_basic_read_main_
 
-#ifndef _di_fss_basic_read_delete_data_
-  f_status_t fss_basic_read_delete_data(fss_basic_read_data_t *data) {
+#ifndef _di_fss_basic_read_data_delete_
+  f_status_t fss_basic_read_data_delete(fss_basic_read_data_t *data) {
 
     for (f_array_length_t i = 0; i < fss_basic_read_total_parameters; i++) {
       f_macro_array_lengths_t_delete_simple(data->parameters[i].locations);
@@ -551,7 +551,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_fss_basic_read_delete_data_
+#endif // _di_fss_basic_read_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_basic_read/c/fss_basic_read.h b/level_3/fss_basic_read/c/fss_basic_read.h
index c5b4898..dfde6f3 100644
--- a/level_3/fss_basic_read/c/fss_basic_read.h
+++ b/level_3/fss_basic_read/c/fss_basic_read.h
@@ -221,7 +221,7 @@ extern "C" {
 /**
  * Execute main program.
  *
- * Be sure to call fss_basic_read_delete_data() after executing this.
+ * Be sure to call fss_basic_read_data_delete() after executing this.
  *
  * @param arguments
  *   The parameters passed to the process.
@@ -233,7 +233,7 @@ extern "C" {
  *
  *   Status codes (with error bit) are returned on any problem.
  *
- * @see fss_basic_read_delete_data()
+ * @see fss_basic_read_data_delete()
  */
 #ifndef _di_fss_basic_read_main_
   extern f_status_t fss_basic_read_main(const f_console_arguments_t arguments, fss_basic_read_data_t *data);
@@ -254,9 +254,9 @@ extern "C" {
  *
  * @see fss_basic_read_main()
  */
-#ifndef _di_fss_basic_read_delete_data_
-  extern f_status_t fss_basic_read_delete_data(fss_basic_read_data_t *data);
-#endif // _di_fss_basic_read_delete_data_
+#ifndef _di_fss_basic_read_data_delete_
+  extern f_status_t fss_basic_read_data_delete(fss_basic_read_data_t *data);
+#endif // _di_fss_basic_read_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_basic_write/c/fss_basic_write.c b/level_3/fss_basic_write/c/fss_basic_write.c
index 7e84866..476d731 100644
--- a/level_3/fss_basic_write/c/fss_basic_write.c
+++ b/level_3/fss_basic_write/c/fss_basic_write.c
@@ -115,7 +115,7 @@ extern "C" {
         }
 
         if (F_status_is_error(status)) {
-          fss_basic_write_delete_data(data);
+          fss_basic_write_data_delete(data);
           return F_status_set_error(status);
         }
       }
@@ -129,7 +129,7 @@ extern "C" {
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
         if (F_status_is_error(status)) {
-          fss_basic_write_delete_data(data);
+          fss_basic_write_data_delete(data);
           return status;
         }
 
@@ -153,14 +153,14 @@ extern "C" {
     if (data->parameters[fss_basic_write_parameter_help].result == f_console_result_found) {
       fss_basic_write_print_help(data->output, data->context);
 
-      fss_basic_write_delete_data(data);
+      fss_basic_write_data_delete(data);
       return status;
     }
 
     if (data->parameters[fss_basic_write_parameter_version].result == f_console_result_found) {
       fll_program_print_version(data->output, fss_basic_write_version);
 
-      fss_basic_write_delete_data(data);
+      fss_basic_write_data_delete(data);
       return status;
     }
 
@@ -499,13 +499,13 @@ extern "C" {
     f_macro_string_dynamic_t_delete_simple(buffer);
     f_macro_string_dynamic_t_delete_simple(object);
     f_macro_string_dynamic_t_delete_simple(content);
-    fss_basic_write_delete_data(data);
+    fss_basic_write_data_delete(data);
     return status;
   }
 #endif // _di_fss_basic_write_main_
 
-#ifndef _di_fss_basic_write_delete_data_
-  f_status_t fss_basic_write_delete_data(fss_basic_write_data_t *data) {
+#ifndef _di_fss_basic_write_data_delete_
+  f_status_t fss_basic_write_data_delete(fss_basic_write_data_t *data) {
 
     for (f_array_length_t i = 0; i < fss_basic_write_total_parameters; i++) {
       f_macro_array_lengths_t_delete_simple(data->parameters[i].locations);
@@ -519,7 +519,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_fss_basic_write_delete_data_
+#endif // _di_fss_basic_write_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_basic_write/c/fss_basic_write.h b/level_3/fss_basic_write/c/fss_basic_write.h
index 5812cab..10d61b1 100644
--- a/level_3/fss_basic_write/c/fss_basic_write.h
+++ b/level_3/fss_basic_write/c/fss_basic_write.h
@@ -169,7 +169,7 @@ extern "C" {
 /**
  * Execute main program.
  *
- * Be sure to call fss_basic_write_delete_data() after executing this.
+ * Be sure to call fss_basic_write_data_delete() after executing this.
  *
  * @param arguments
  *   The parameters passed to the process.
@@ -180,7 +180,7 @@ extern "C" {
  *   F_none on success.
  *   Status codes (with error bit) are returned on any problem.
  *
- * @see fss_basic_write_delete_data()
+ * @see fss_basic_write_data_delete()
  */
 #ifndef _di_fss_basic_write_main_
   extern f_status_t fss_basic_write_main(const f_console_arguments_t arguments, fss_basic_write_data_t *data);
@@ -200,9 +200,9 @@ extern "C" {
  *
  * @see fss_basic_write_main()
  */
-#ifndef _di_fss_basic_write_delete_data_
-  extern f_status_t fss_basic_write_delete_data(fss_basic_write_data_t *data);
-#endif // _di_fss_basic_write_delete_data_
+#ifndef _di_fss_basic_write_data_delete_
+  extern f_status_t fss_basic_write_data_delete(fss_basic_write_data_t *data);
+#endif // _di_fss_basic_write_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c
index 808577c..ad738db 100644
--- a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c
+++ b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c
@@ -190,7 +190,7 @@ extern "C" {
         }
 
         if (F_status_is_error(status)) {
-          fss_embedded_list_read_delete_data(data);
+          fss_embedded_list_read_data_delete(data);
           return F_status_set_error(status);
         }
       }
@@ -204,7 +204,7 @@ extern "C" {
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
         if (F_status_is_error(status)) {
-          fss_embedded_list_read_delete_data(data);
+          fss_embedded_list_read_data_delete(data);
           return status;
         }
 
@@ -228,14 +228,14 @@ extern "C" {
     if (data->parameters[fss_embedded_list_read_parameter_help].result == f_console_result_found) {
       fss_embedded_list_read_print_help(data->output, data->context);
 
-      fss_embedded_list_read_delete_data(data);
+      fss_embedded_list_read_data_delete(data);
       return F_none;
     }
 
     if (data->parameters[fss_embedded_list_read_parameter_version].result == f_console_result_found) {
       fll_program_print_version(data->output, fss_embedded_list_read_version);
 
-      fss_embedded_list_read_delete_data(data);
+      fss_embedded_list_read_data_delete(data);
       return F_none;
     }
 
@@ -514,13 +514,13 @@ extern "C" {
       status = F_status_set_error(F_parameter);
     }
 
-    fss_embedded_list_read_delete_data(data);
+    fss_embedded_list_read_data_delete(data);
     return status;
   }
 #endif // _di_fss_embedded_list_read_main_
 
-#ifndef _di_fss_embedded_list_read_delete_data_
-  f_status_t fss_embedded_list_read_delete_data(fss_embedded_list_read_data_t *data) {
+#ifndef _di_fss_embedded_list_read_data_delete_
+  f_status_t fss_embedded_list_read_data_delete(fss_embedded_list_read_data_t *data) {
 
     for (f_array_length_t i = 0; i < fss_embedded_list_read_total_parameters; i++) {
       f_macro_array_lengths_t_delete_simple(data->parameters[i].locations);
@@ -537,7 +537,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_fss_embedded_list_read_delete_data_
+#endif // _di_fss_embedded_list_read_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h
index 9614af7..e218b66 100644
--- a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h
+++ b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h
@@ -219,7 +219,7 @@ extern "C" {
 /**
  * Execute main program.
  *
- * Be sure to call fss_embedded_list_read_delete_data() after executing this.
+ * Be sure to call fss_embedded_list_read_data_delete() after executing this.
  *
  * @param arguments
  *   The parameters passed to the process.
@@ -231,7 +231,7 @@ extern "C" {
  *
  *   Status codes (with error bit) are returned on any problem.
  *
- * @see fss_embedded_list_read_delete_data()
+ * @see fss_embedded_list_read_data_delete()
  */
 #ifndef _di_fss_embedded_list_read_main_
   extern f_status_t fss_embedded_list_read_main(const f_console_arguments_t arguments, fss_embedded_list_read_data_t *data);
@@ -252,9 +252,9 @@ extern "C" {
  *
  * @see fss_embedded_list_read_main()
  */
-#ifndef _di_fss_embedded_list_read_delete_data_
-  extern f_status_t fss_embedded_list_read_delete_data(fss_embedded_list_read_data_t *data);
-#endif // _di_fss_embedded_list_read_delete_data_
+#ifndef _di_fss_embedded_list_read_data_delete_
+  extern f_status_t fss_embedded_list_read_data_delete(fss_embedded_list_read_data_t *data);
+#endif // _di_fss_embedded_list_read_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.c b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.c
index b949815..61c7a07 100644
--- a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.c
+++ b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.c
@@ -123,7 +123,7 @@ extern "C" {
         }
 
         if (F_status_is_error(status)) {
-          fss_embedded_list_write_delete_data(data);
+          fss_embedded_list_write_data_delete(data);
           return F_status_set_error(status);
         }
       }
@@ -137,7 +137,7 @@ extern "C" {
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
         if (F_status_is_error(status)) {
-          fss_embedded_list_write_delete_data(data);
+          fss_embedded_list_write_data_delete(data);
           return status;
         }
 
@@ -161,14 +161,14 @@ extern "C" {
     if (data->parameters[fss_embedded_list_write_parameter_help].result == f_console_result_found) {
       fss_embedded_list_write_print_help(data->output, data->context);
 
-      fss_embedded_list_write_delete_data(data);
+      fss_embedded_list_write_data_delete(data);
       return status;
     }
 
     if (data->parameters[fss_embedded_list_write_parameter_version].result == f_console_result_found) {
       fll_program_print_version(data->output, fss_embedded_list_write_version);
 
-      fss_embedded_list_write_delete_data(data);
+      fss_embedded_list_write_data_delete(data);
       return status;
     }
 
@@ -517,13 +517,13 @@ extern "C" {
     f_macro_string_dynamic_t_delete_simple(buffer);
     f_macro_string_dynamic_t_delete_simple(object);
     f_macro_string_dynamic_t_delete_simple(content);
-    fss_embedded_list_write_delete_data(data);
+    fss_embedded_list_write_data_delete(data);
     return status;
   }
 #endif // _di_fss_embedded_list_write_main_
 
-#ifndef _di_fss_embedded_list_write_delete_data_
-  f_status_t fss_embedded_list_write_delete_data(fss_embedded_list_write_data_t *data) {
+#ifndef _di_fss_embedded_list_write_data_delete_
+  f_status_t fss_embedded_list_write_data_delete(fss_embedded_list_write_data_t *data) {
 
     for (f_array_length_t i = 0; i < fss_embedded_list_write_total_parameters; i++) {
       f_macro_array_lengths_t_delete_simple(data->parameters[i].locations);
@@ -537,7 +537,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_fss_embedded_list_write_delete_data_
+#endif // _di_fss_embedded_list_write_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h
index e256b18..d7f0086 100644
--- a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h
+++ b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h
@@ -171,7 +171,7 @@ extern "C" {
 /**
  * Execute main program.
  *
- * Be sure to call fss_embedded_list_write_delete_data() after executing this.
+ * Be sure to call fss_embedded_list_write_data_delete() after executing this.
  *
  * @param arguments
  *   The parameters passed to the process.
@@ -183,7 +183,7 @@ extern "C" {
  *
  *   Status codes (with error bit) are returned on any problem.
  *
- * @see fss_embedded_list_write_delete_data()
+ * @see fss_embedded_list_write_data_delete()
  */
 #ifndef _di_fss_embedded_list_write_main_
   extern f_status_t fss_embedded_list_write_main(const f_console_arguments_t arguments, fss_embedded_list_write_data_t *data);
@@ -204,9 +204,9 @@ extern "C" {
  *
  * @see fss_embedded_list_write_main()
  */
-#ifndef _di_fss_embedded_list_write_delete_data_
-  extern f_status_t fss_embedded_list_write_delete_data(fss_embedded_list_write_data_t *data);
-#endif // _di_fss_embedded_list_write_delete_data_
+#ifndef _di_fss_embedded_list_write_data_delete_
+  extern f_status_t fss_embedded_list_write_data_delete(fss_embedded_list_write_data_t *data);
+#endif // _di_fss_embedded_list_write_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_extended_list_read/c/fss_extended_list_read.c b/level_3/fss_extended_list_read/c/fss_extended_list_read.c
index 3d44b11..6aaebb9 100644
--- a/level_3/fss_extended_list_read/c/fss_extended_list_read.c
+++ b/level_3/fss_extended_list_read/c/fss_extended_list_read.c
@@ -190,7 +190,7 @@ extern "C" {
         }
 
         if (F_status_is_error(status)) {
-          fss_extended_list_read_delete_data(data);
+          fss_extended_list_read_data_delete(data);
           return F_status_set_error(status);
         }
       }
@@ -204,7 +204,7 @@ extern "C" {
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
         if (F_status_is_error(status)) {
-          fss_extended_list_read_delete_data(data);
+          fss_extended_list_read_data_delete(data);
           return status;
         }
 
@@ -228,14 +228,14 @@ extern "C" {
     if (data->parameters[fss_extended_list_read_parameter_help].result == f_console_result_found) {
       fss_extended_list_read_print_help(data->output, data->context);
 
-      fss_extended_list_read_delete_data(data);
+      fss_extended_list_read_data_delete(data);
       return status;
     }
 
     if (data->parameters[fss_extended_list_read_parameter_version].result == f_console_result_found) {
       fll_program_print_version(data->output, fss_extended_list_read_version);
 
-      fss_extended_list_read_delete_data(data);
+      fss_extended_list_read_data_delete(data);
       return status;
     }
 
@@ -422,7 +422,7 @@ extern "C" {
           fprintf(data->output.stream, "0%c", f_string_eol_s[0]);
         }
 
-        fss_extended_list_read_delete_data(data);
+        fss_extended_list_read_data_delete(data);
         return F_none;
       }
 
@@ -530,13 +530,13 @@ extern "C" {
       status = F_status_set_error(F_parameter);
     }
 
-    fss_extended_list_read_delete_data(data);
+    fss_extended_list_read_data_delete(data);
     return status;
   }
 #endif // _di_fss_extended_list_read_main_
 
-#ifndef _di_fss_extended_list_read_delete_data_
-  f_status_t fss_extended_list_read_delete_data(fss_extended_list_read_data_t *data) {
+#ifndef _di_fss_extended_list_read_data_delete_
+  f_status_t fss_extended_list_read_data_delete(fss_extended_list_read_data_t *data) {
 
     for (f_array_length_t i = 0; i < fss_extended_list_read_total_parameters; i++) {
       f_macro_array_lengths_t_delete_simple(data->parameters[i].locations);
@@ -553,7 +553,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_fss_extended_list_read_delete_data_
+#endif // _di_fss_extended_list_read_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_extended_list_read/c/fss_extended_list_read.h b/level_3/fss_extended_list_read/c/fss_extended_list_read.h
index e3dba48..71adcda 100644
--- a/level_3/fss_extended_list_read/c/fss_extended_list_read.h
+++ b/level_3/fss_extended_list_read/c/fss_extended_list_read.h
@@ -221,7 +221,7 @@ extern "C" {
 /**
  * Execute main program.
  *
- * Be sure to call fss_extended_list_read_delete_data() after executing this.
+ * Be sure to call fss_extended_list_read_data_delete() after executing this.
  *
  * @param arguments
  *   The parameters passed to the process.
@@ -233,7 +233,7 @@ extern "C" {
  *
  *   Status codes (with error bit) are returned on any problem.
  *
- * @see fss_extended_list_read_delete_data()
+ * @see fss_extended_list_read_data_delete()
  */
 #ifndef _di_fss_extended_list_read_main_
   extern f_status_t fss_extended_list_read_main(const f_console_arguments_t arguments, fss_extended_list_read_data_t *data);
@@ -254,9 +254,9 @@ extern "C" {
  *
  * @see fss_extended_list_read_main()
  */
-#ifndef _di_fss_extended_list_read_delete_data_
-  extern f_status_t fss_extended_list_read_delete_data(fss_extended_list_read_data_t *data);
-#endif // _di_fss_extended_list_read_delete_data_
+#ifndef _di_fss_extended_list_read_data_delete_
+  extern f_status_t fss_extended_list_read_data_delete(fss_extended_list_read_data_t *data);
+#endif // _di_fss_extended_list_read_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_extended_list_write/c/fss_extended_list_write.c b/level_3/fss_extended_list_write/c/fss_extended_list_write.c
index cbf5612..d7f2f80 100644
--- a/level_3/fss_extended_list_write/c/fss_extended_list_write.c
+++ b/level_3/fss_extended_list_write/c/fss_extended_list_write.c
@@ -123,7 +123,7 @@ extern "C" {
         }
 
         if (F_status_is_error(status)) {
-          fss_extended_list_write_delete_data(data);
+          fss_extended_list_write_data_delete(data);
           return F_status_set_error(status);
         }
       }
@@ -137,7 +137,7 @@ extern "C" {
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
         if (F_status_is_error(status)) {
-          fss_extended_list_write_delete_data(data);
+          fss_extended_list_write_data_delete(data);
           return status;
         }
 
@@ -161,14 +161,14 @@ extern "C" {
     if (data->parameters[fss_extended_list_write_parameter_help].result == f_console_result_found) {
       fss_extended_list_write_print_help(data->output, data->context);
 
-      fss_extended_list_write_delete_data(data);
+      fss_extended_list_write_data_delete(data);
       return status;
     }
 
     if (data->parameters[fss_extended_list_write_parameter_version].result == f_console_result_found) {
       fll_program_print_version(data->output, fss_extended_list_write_version);
 
-      fss_extended_list_write_delete_data(data);
+      fss_extended_list_write_data_delete(data);
       return status;
     }
 
@@ -517,13 +517,13 @@ extern "C" {
     f_macro_string_dynamic_t_delete_simple(buffer);
     f_macro_string_dynamic_t_delete_simple(object);
     f_macro_string_dynamic_t_delete_simple(content);
-    fss_extended_list_write_delete_data(data);
+    fss_extended_list_write_data_delete(data);
     return status;
   }
 #endif // _di_fss_extended_list_write_main_
 
-#ifndef _di_fss_extended_list_write_delete_data_
-  f_status_t fss_extended_list_write_delete_data(fss_extended_list_write_data_t *data) {
+#ifndef _di_fss_extended_list_write_data_delete_
+  f_status_t fss_extended_list_write_data_delete(fss_extended_list_write_data_t *data) {
 
     for (f_array_length_t i = 0; i < fss_extended_list_write_total_parameters; i++) {
       f_macro_array_lengths_t_delete_simple(data->parameters[i].locations);
@@ -537,7 +537,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_fss_extended_list_write_delete_data_
+#endif // _di_fss_extended_list_write_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_extended_list_write/c/fss_extended_list_write.h b/level_3/fss_extended_list_write/c/fss_extended_list_write.h
index 7f0c68f..b41c6aa 100644
--- a/level_3/fss_extended_list_write/c/fss_extended_list_write.h
+++ b/level_3/fss_extended_list_write/c/fss_extended_list_write.h
@@ -171,7 +171,7 @@ extern "C" {
 /**
  * Execute main program.
  *
- * Be sure to call fss_extended_list_write_delete_data() after executing this.
+ * Be sure to call fss_extended_list_write_data_delete() after executing this.
  *
  * @param arguments
  *   The parameters passed to the process.
@@ -183,7 +183,7 @@ extern "C" {
  *
  *   Status codes (with error bit) are returned on any problem.
  *
- * @see fss_extended_list_write_delete_data()
+ * @see fss_extended_list_write_data_delete()
  */
 #ifndef _di_fss_extended_list_write_main_
   extern f_status_t fss_extended_list_write_main(const f_console_arguments_t arguments, fss_extended_list_write_data_t *data);
@@ -204,9 +204,9 @@ extern "C" {
  *
  * @see fss_extended_list_write_main()
  */
-#ifndef _di_fss_extended_list_write_delete_data_
-  extern f_status_t fss_extended_list_write_delete_data(fss_extended_list_write_data_t *data);
-#endif // _di_fss_extended_list_write_delete_data_
+#ifndef _di_fss_extended_list_write_data_delete_
+  extern f_status_t fss_extended_list_write_data_delete(fss_extended_list_write_data_t *data);
+#endif // _di_fss_extended_list_write_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_extended_read/c/fss_extended_read.c b/level_3/fss_extended_read/c/fss_extended_read.c
index 2f0bd5a..8d019ee 100644
--- a/level_3/fss_extended_read/c/fss_extended_read.c
+++ b/level_3/fss_extended_read/c/fss_extended_read.c
@@ -190,7 +190,7 @@ extern "C" {
         }
 
         if (F_status_is_error(status)) {
-          fss_extended_read_delete_data(data);
+          fss_extended_read_data_delete(data);
           return F_status_set_error(status);
         }
       }
@@ -204,7 +204,7 @@ extern "C" {
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
         if (F_status_is_error(status)) {
-          fss_extended_read_delete_data(data);
+          fss_extended_read_data_delete(data);
           return status;
         }
 
@@ -228,14 +228,14 @@ extern "C" {
     if (data->parameters[fss_extended_read_parameter_help].result == f_console_result_found) {
       fss_extended_read_print_help(data->output, data->context);
 
-      fss_extended_read_delete_data(data);
+      fss_extended_read_data_delete(data);
       return F_none;
     }
 
     if (data->parameters[fss_extended_read_parameter_version].result == f_console_result_found) {
       fll_program_print_version(data->output, fss_extended_read_version);
 
-      fss_extended_read_delete_data(data);
+      fss_extended_read_data_delete(data);
       return F_none;
     }
 
@@ -422,7 +422,7 @@ extern "C" {
           fprintf(data->output.stream, "0%c", f_string_eol_s[0]);
         }
 
-        fss_extended_read_delete_data(data);
+        fss_extended_read_data_delete(data);
         return F_none;
       }
 
@@ -530,13 +530,13 @@ extern "C" {
       status = F_status_set_error(F_parameter);
     }
 
-    fss_extended_read_delete_data(data);
+    fss_extended_read_data_delete(data);
     return status;
   }
 #endif // _di_fss_extended_read_main_
 
-#ifndef _di_fss_extended_read_delete_data_
-  f_status_t fss_extended_read_delete_data(fss_extended_read_data_t *data) {
+#ifndef _di_fss_extended_read_data_delete_
+  f_status_t fss_extended_read_data_delete(fss_extended_read_data_t *data) {
 
     for (f_array_length_t i = 0; i < fss_extended_read_total_parameters; i++) {
       f_macro_array_lengths_t_delete_simple(data->parameters[i].locations);
@@ -553,7 +553,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_fss_extended_read_delete_data_
+#endif // _di_fss_extended_read_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_extended_read/c/fss_extended_read.h b/level_3/fss_extended_read/c/fss_extended_read.h
index 15a16da..978c537 100644
--- a/level_3/fss_extended_read/c/fss_extended_read.h
+++ b/level_3/fss_extended_read/c/fss_extended_read.h
@@ -221,7 +221,7 @@ extern "C" {
 /**
  * Execute main program.
  *
- * Be sure to call fss_extended_read_delete_data() after executing this.
+ * Be sure to call fss_extended_read_data_delete() after executing this.
  *
  * @param arguments
  *   The parameters passed to the process.
@@ -233,7 +233,7 @@ extern "C" {
  *
  *   Status codes (with error bit) are returned on any problem.
  *
- * @see fss_extended_read_delete_data()
+ * @see fss_extended_read_data_delete()
  */
 #ifndef _di_fss_extended_read_main_
   extern f_status_t fss_extended_read_main(const f_console_arguments_t arguments, fss_extended_read_data_t *data);
@@ -254,9 +254,9 @@ extern "C" {
  *
  * @see fss_extended_read_main()
  */
-#ifndef _di_fss_extended_read_delete_data_
-  extern f_status_t fss_extended_read_delete_data(fss_extended_read_data_t *data);
-#endif // _di_fss_extended_read_delete_data_
+#ifndef _di_fss_extended_read_data_delete_
+  extern f_status_t fss_extended_read_data_delete(fss_extended_read_data_t *data);
+#endif // _di_fss_extended_read_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_extended_write/c/fss_extended_write.c b/level_3/fss_extended_write/c/fss_extended_write.c
index 0597380..e8555a9 100644
--- a/level_3/fss_extended_write/c/fss_extended_write.c
+++ b/level_3/fss_extended_write/c/fss_extended_write.c
@@ -115,7 +115,7 @@ extern "C" {
         }
 
         if (F_status_is_error(status)) {
-          fss_extended_write_delete_data(data);
+          fss_extended_write_data_delete(data);
           return F_status_set_error(status);
         }
       }
@@ -129,7 +129,7 @@ extern "C" {
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
         if (F_status_is_error(status)) {
-          fss_extended_write_delete_data(data);
+          fss_extended_write_data_delete(data);
           return status;
         }
 
@@ -153,14 +153,14 @@ extern "C" {
     if (data->parameters[fss_extended_write_parameter_help].result == f_console_result_found) {
       fss_extended_write_print_help(data->output, data->context);
 
-      fss_extended_write_delete_data(data);
+      fss_extended_write_data_delete(data);
       return status;
     }
 
     if (data->parameters[fss_extended_write_parameter_version].result == f_console_result_found) {
       fll_program_print_version(data->output, fss_extended_write_version);
 
-      fss_extended_write_delete_data(data);
+      fss_extended_write_data_delete(data);
       return status;
     }
 
@@ -573,13 +573,13 @@ extern "C" {
     f_macro_string_dynamic_t_delete_simple(buffer);
     f_macro_string_dynamic_t_delete_simple(object);
     f_macro_string_dynamics_t_delete_simple(contents);
-    fss_extended_write_delete_data(data);
+    fss_extended_write_data_delete(data);
     return status;
   }
 #endif // _di_fss_extended_write_main_
 
-#ifndef _di_fss_extended_write_delete_data_
-  f_status_t fss_extended_write_delete_data(fss_extended_write_data_t *data) {
+#ifndef _di_fss_extended_write_data_delete_
+  f_status_t fss_extended_write_data_delete(fss_extended_write_data_t *data) {
 
     for (f_array_length_t i = 0; i < fss_extended_write_total_parameters; i++) {
       f_macro_array_lengths_t_delete_simple(data->parameters[i].locations);
@@ -593,7 +593,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_fss_extended_write_delete_data_
+#endif // _di_fss_extended_write_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_extended_write/c/fss_extended_write.h b/level_3/fss_extended_write/c/fss_extended_write.h
index 99c4818..c2d1c64 100644
--- a/level_3/fss_extended_write/c/fss_extended_write.h
+++ b/level_3/fss_extended_write/c/fss_extended_write.h
@@ -170,7 +170,7 @@ extern "C" {
 /**
  * Execute main program.
  *
- * Be sure to call fss_extended_write_delete_data() after executing this.
+ * Be sure to call fss_extended_write_data_delete() after executing this.
  *
  * @param arguments
  *   The parameters passed to the process.
@@ -182,7 +182,7 @@ extern "C" {
  *
  *   Status codes (with error bit) are returned on any problem.
  *
- * @see fss_extended_write_delete_data()
+ * @see fss_extended_write_data_delete()
  */
 #ifndef _di_fss_extended_write_main_
   extern f_status_t fss_extended_write_main(const f_console_arguments_t arguments, fss_extended_write_data_t *data);
@@ -203,9 +203,9 @@ extern "C" {
  *
  * @see fss_extended_write_main()
  */
-#ifndef _di_fss_extended_write_delete_data_
-  extern f_status_t fss_extended_write_delete_data(fss_extended_write_data_t *data);
-#endif // _di_fss_extended_write_delete_data_
+#ifndef _di_fss_extended_write_data_delete_
+  extern f_status_t fss_extended_write_data_delete(fss_extended_write_data_t *data);
+#endif // _di_fss_extended_write_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_status_code/c/fss_status_code.c b/level_3/fss_status_code/c/fss_status_code.c
index 4384125..e5138ec 100644
--- a/level_3/fss_status_code/c/fss_status_code.c
+++ b/level_3/fss_status_code/c/fss_status_code.c
@@ -65,7 +65,7 @@ extern "C" {
         }
 
         if (F_status_is_error(status)) {
-          fss_status_code_delete_data(data);
+          fss_status_code_data_delete(data);
           return F_status_set_error(status);
         }
       }
@@ -79,7 +79,7 @@ extern "C" {
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
         if (F_status_is_error(status)) {
-          fss_status_code_delete_data(data);
+          fss_status_code_data_delete(data);
           return status;
         }
 
@@ -103,14 +103,14 @@ extern "C" {
     if (data->parameters[fss_status_code_parameter_help].result == f_console_result_found) {
       fss_status_code_print_help(data->output, data->context);
 
-      fss_status_code_delete_data(data);
+      fss_status_code_data_delete(data);
       return F_none;
     }
 
     if (data->parameters[fss_status_code_parameter_version].result == f_console_result_found) {
       fll_program_print_version(data->output, fss_status_code_version);
 
-      fss_status_code_delete_data(data);
+      fss_status_code_data_delete(data);
       return F_none;
     }
 
@@ -122,7 +122,7 @@ extern "C" {
         f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_status_code_long_is_warning);
         f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]);
 
-        fss_status_code_delete_data(data);
+        fss_status_code_data_delete(data);
         return F_status_set_error(status);
       }
       else if (data->parameters[fss_status_code_parameter_is_fine].result == f_console_result_found) {
@@ -132,7 +132,7 @@ extern "C" {
         f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_status_code_long_is_fine);
         f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]);
 
-        fss_status_code_delete_data(data);
+        fss_status_code_data_delete(data);
         return F_status_set_error(status);
       }
     }
@@ -143,14 +143,14 @@ extern "C" {
       f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_status_code_long_is_fine);
       f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]);
 
-      fss_status_code_delete_data(data);
+      fss_status_code_data_delete(data);
       return F_status_set_error(status);
     }
 
     if (data->remaining.used == 0 && !data->process_pipe) {
       f_color_print(data->error.to.stream, data->context.set.error, "%sYou failed to specify an error code.%c", fll_error_print_error, f_string_eol_s[0]);
 
-      fss_status_code_delete_data(data);
+      fss_status_code_data_delete(data);
       return F_status_set_error(F_parameter);
     }
 
@@ -204,13 +204,13 @@ extern "C" {
       }
     }
 
-    fss_status_code_delete_data(data);
+    fss_status_code_data_delete(data);
     return status;
   }
 #endif // _di_fss_status_code_main_
 
-#ifndef _di_fss_status_code_delete_data_
-  f_status_t fss_status_code_delete_data(fss_status_code_data_t *data) {
+#ifndef _di_fss_status_code_data_delete_
+  f_status_t fss_status_code_data_delete(fss_status_code_data_t *data) {
 
     for (f_array_length_t i = 0; i < fss_status_code_total_parameters; i++) {
       f_macro_array_lengths_t_delete_simple(data->parameters[i].locations);
@@ -224,7 +224,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_fss_status_code_delete_data_
+#endif // _di_fss_status_code_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/fss_status_code/c/fss_status_code.h b/level_3/fss_status_code/c/fss_status_code.h
index 4ab9b7b..ce50d8e 100644
--- a/level_3/fss_status_code/c/fss_status_code.h
+++ b/level_3/fss_status_code/c/fss_status_code.h
@@ -145,7 +145,7 @@ extern "C" {
 /**
  * Execute main program.
  *
- * Be sure to call fss_status_code_delete_data() after executing this.
+ * Be sure to call fss_status_code_data_delete() after executing this.
  *
  * @param arguments
  *   The parameters passed to the process.
@@ -157,7 +157,7 @@ extern "C" {
  *
  *   Status codes (with error bit) are returned on any problem.
  *
- * @see fss_status_code_delete_data()
+ * @see fss_status_code_data_delete()
  */
 #ifndef _di_fss_status_code_main_
   extern f_status_t fss_status_code_main(const f_console_arguments_t arguments, fss_status_code_data_t *data);
@@ -178,9 +178,9 @@ extern "C" {
  *
  * @see fss_status_code_main()
  */
-#ifndef _di_fss_status_code_delete_data_
-  extern f_status_t fss_status_code_delete_data(fss_status_code_data_t *data);
-#endif // _di_fss_status_code_delete_data_
+#ifndef _di_fss_status_code_data_delete_
+  extern f_status_t fss_status_code_data_delete(fss_status_code_data_t *data);
+#endif // _di_fss_status_code_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/iki_read/c/iki_read.c b/level_3/iki_read/c/iki_read.c
index 144bee7..83d0f5c 100644
--- a/level_3/iki_read/c/iki_read.c
+++ b/level_3/iki_read/c/iki_read.c
@@ -126,7 +126,7 @@ extern "C" {
             fprintf(data->error.to.stream, "%c", f_string_eol_s[0]);
           }
 
-          iki_read_delete_data(data);
+          iki_read_data_delete(data);
           return F_status_set_error(status);
         }
       }
@@ -142,7 +142,7 @@ extern "C" {
         if (F_status_is_error(status)) {
           fll_error_print(data->error, F_status_set_fine(status), "f_console_parameter_prioritize_right", F_true);
 
-          iki_read_delete_data(data);
+          iki_read_data_delete(data);
           return status;
         }
 
@@ -166,14 +166,14 @@ extern "C" {
     if (data->parameters[iki_read_parameter_help].result == f_console_result_found) {
       iki_read_print_help(data->output, data->context);
 
-      iki_read_delete_data(data);
+      iki_read_data_delete(data);
       return F_none;
     }
 
     if (data->parameters[iki_read_parameter_version].result == f_console_result_found) {
       fll_program_print_version(data->output, iki_read_version);
 
-      iki_read_delete_data(data);
+      iki_read_data_delete(data);
       return F_none;
     }
 
@@ -381,7 +381,7 @@ extern "C" {
           fprintf(data->error.to.stream, "%c", f_string_eol_s[0]);
         }
 
-        iki_read_delete_data(data);
+        iki_read_data_delete(data);
         return F_status_set_error(F_parameter);
       }
 
@@ -467,13 +467,13 @@ extern "C" {
       }
     }
 
-    iki_read_delete_data(data);
+    iki_read_data_delete(data);
     return status;
   }
 #endif // _di_iki_read_main_
 
-#ifndef _di_iki_read_delete_data_
-  f_status_t iki_read_delete_data(iki_read_data_t *data) {
+#ifndef _di_iki_read_data_delete_
+  f_status_t iki_read_data_delete(iki_read_data_t *data) {
 
     for (f_array_length_t i = 0; i < iki_read_total_parameters; i++) {
       f_macro_array_lengths_t_delete_simple(data->parameters[i].locations);
@@ -488,7 +488,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_iki_read_delete_data_
+#endif // _di_iki_read_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/iki_read/c/iki_read.h b/level_3/iki_read/c/iki_read.h
index 998541a..56388f6 100644
--- a/level_3/iki_read/c/iki_read.h
+++ b/level_3/iki_read/c/iki_read.h
@@ -236,7 +236,7 @@ extern "C" {
 /**
  * Execute main program.
  *
- * Be sure to call iki_read_delete_data() after executing this.
+ * Be sure to call iki_read_data_delete() after executing this.
  *
  * @param arguments
  *   The parameters passed to the process.
@@ -248,7 +248,7 @@ extern "C" {
  *
  *   Status codes (with error bit) are returned on any problem.
  *
- * @see iki_read_delete_data()
+ * @see iki_read_data_delete()
  */
 #ifndef _di_iki_read_main_
   extern f_status_t iki_read_main(const f_console_arguments_t arguments, iki_read_data_t *data);
@@ -269,9 +269,9 @@ extern "C" {
  *
  * @see iki_read_main()
  */
-#ifndef _di_iki_read_delete_data_
-  extern f_status_t iki_read_delete_data(iki_read_data_t *data);
-#endif // _di_iki_read_delete_data_
+#ifndef _di_iki_read_data_delete_
+  extern f_status_t iki_read_data_delete(iki_read_data_t *data);
+#endif // _di_iki_read_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/iki_write/c/iki_write.c b/level_3/iki_write/c/iki_write.c
index 93fbacf..94a128a 100644
--- a/level_3/iki_write/c/iki_write.c
+++ b/level_3/iki_write/c/iki_write.c
@@ -88,7 +88,7 @@ extern "C" {
             fprintf(data->error.to.stream, "%c", f_string_eol_s[0]);
           }
 
-          iki_write_delete_data(data);
+          iki_write_data_delete(data);
           return F_status_set_error(status);
         }
       }
@@ -102,7 +102,7 @@ extern "C" {
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
         if (F_status_is_error(status)) {
-          iki_write_delete_data(data);
+          iki_write_data_delete(data);
           return status;
         }
 
@@ -126,14 +126,14 @@ extern "C" {
     if (data->parameters[iki_write_parameter_help].result == f_console_result_found) {
       iki_write_print_help(data->output, data->context);
 
-      iki_write_delete_data(data);
+      iki_write_data_delete(data);
       return F_none;
     }
 
     if (data->parameters[iki_write_parameter_version].result == f_console_result_found) {
       fll_program_print_version(data->output, iki_write_version);
 
-      iki_write_delete_data(data);
+      iki_write_data_delete(data);
       return F_none;
     }
 
@@ -413,13 +413,13 @@ extern "C" {
       }
     }
 
-    iki_write_delete_data(data);
+    iki_write_data_delete(data);
     return status;
   }
 #endif // _di_iki_write_main_
 
-#ifndef _di_iki_write_delete_data_
-  f_status_t iki_write_delete_data(iki_write_data_t *data) {
+#ifndef _di_iki_write_data_delete_
+  f_status_t iki_write_data_delete(iki_write_data_t *data) {
 
     for (f_array_length_t i = 0; i < iki_write_total_parameters; i++) {
       f_macro_array_lengths_t_delete_simple(data->parameters[i].locations);
@@ -434,7 +434,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_iki_write_delete_data_
+#endif // _di_iki_write_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/iki_write/c/iki_write.h b/level_3/iki_write/c/iki_write.h
index 860f5a0..2ee21f6 100644
--- a/level_3/iki_write/c/iki_write.h
+++ b/level_3/iki_write/c/iki_write.h
@@ -161,7 +161,7 @@ extern "C" {
 /**
  * Execute main program.
  *
- * Be sure to call iki_write_delete_data() after executing this.
+ * Be sure to call iki_write_data_delete() after executing this.
  *
  * @param arguments
  *   The parameters passed to the process.
@@ -173,7 +173,7 @@ extern "C" {
  *
  *   Status codes (with error bit) are returned on any problem.
  *
- * @see iki_write_delete_data()
+ * @see iki_write_data_delete()
  */
 #ifndef _di_iki_write_main_
   extern f_status_t iki_write_main(const f_console_arguments_t arguments, iki_write_data_t *data);
@@ -194,9 +194,9 @@ extern "C" {
  *
  * @see iki_write_main()
  */
-#ifndef _di_iki_write_delete_data_
-  extern f_status_t iki_write_delete_data(iki_write_data_t *data);
-#endif // _di_iki_write_delete_data_
+#ifndef _di_iki_write_data_delete_
+  extern f_status_t iki_write_data_delete(iki_write_data_t *data);
+#endif // _di_iki_write_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/status_code/c/status_code.c b/level_3/status_code/c/status_code.c
index 72f1260..59daaea 100644
--- a/level_3/status_code/c/status_code.c
+++ b/level_3/status_code/c/status_code.c
@@ -65,7 +65,7 @@ extern "C" {
         }
 
         if (F_status_is_error(status)) {
-          status_code_delete_data(data);
+          status_code_data_delete(data);
           return F_status_set_error(status);
         }
       }
@@ -79,7 +79,7 @@ extern "C" {
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
         if (F_status_is_error(status)) {
-          status_code_delete_data(data);
+          status_code_data_delete(data);
           return status;
         }
 
@@ -103,14 +103,14 @@ extern "C" {
     if (data->parameters[status_code_parameter_help].result == f_console_result_found) {
       status_code_print_help(data->output, data->context);
 
-      status_code_delete_data(data);
+      status_code_data_delete(data);
       return F_none;
     }
 
     if (data->parameters[status_code_parameter_version].result == f_console_result_found) {
       fll_program_print_version(data->output, status_code_version);
 
-      status_code_delete_data(data);
+      status_code_data_delete(data);
       return F_none;
     }
 
@@ -122,7 +122,7 @@ extern "C" {
         f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, status_code_long_is_warning);
         f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]);
 
-        status_code_delete_data(data);
+        status_code_data_delete(data);
         return F_status_set_error(status);
       }
       else if (data->parameters[status_code_parameter_is_fine].result == f_console_result_found) {
@@ -132,7 +132,7 @@ extern "C" {
         f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, status_code_long_is_fine);
         f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]);
 
-        status_code_delete_data(data);
+        status_code_data_delete(data);
         return F_status_set_error(status);
       }
     }
@@ -143,14 +143,14 @@ extern "C" {
       f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, status_code_long_is_fine);
       f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]);
 
-      status_code_delete_data(data);
+      status_code_data_delete(data);
       return F_status_set_error(status);
     }
 
     if (data->remaining.used == 0 && !data->process_pipe) {
       f_color_print(data->error.to.stream, data->context.set.error, "%sYou failed to specify a status code.%c", fll_error_print_error, f_string_eol_s[0]);
 
-      status_code_delete_data(data);
+      status_code_data_delete(data);
       return F_status_set_error(F_parameter);
     }
 
@@ -205,13 +205,13 @@ extern "C" {
       }
     }
 
-    status_code_delete_data(data);
+    status_code_data_delete(data);
     return status;
   }
 #endif // _di_status_code_main_
 
-#ifndef _di_status_code_delete_data_
-  f_status_t status_code_delete_data(status_code_data_t *data) {
+#ifndef _di_status_code_data_delete_
+  f_status_t status_code_data_delete(status_code_data_t *data) {
 
     for (f_array_length_t i = 0; i < status_code_total_parameters; i++) {
       f_macro_array_lengths_t_delete_simple(data->parameters[i].locations);
@@ -225,7 +225,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_status_code_delete_data_
+#endif // _di_status_code_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_3/status_code/c/status_code.h b/level_3/status_code/c/status_code.h
index cf3074b..22df705 100644
--- a/level_3/status_code/c/status_code.h
+++ b/level_3/status_code/c/status_code.h
@@ -144,7 +144,7 @@ extern "C" {
 /**
  * Execute main program.
  *
- * Be sure to call status_code_delete_data() after executing this.
+ * Be sure to call status_code_data_delete() after executing this.
  *
  * @param arguments
  *   The parameters passed to the process.
@@ -156,7 +156,7 @@ extern "C" {
  *
  *   Status codes (with error bit) are returned on any problem.
  *
- * @see status_code_delete_data()
+ * @see status_code_data_delete()
  */
 #ifndef _di_status_code_main_
   extern f_status_t status_code_main(const f_console_arguments_t arguments, status_code_data_t *data);
@@ -177,9 +177,9 @@ extern "C" {
  *
  * @see status_code_main()
  */
-#ifndef _di_status_code_delete_data_
-  extern f_status_t status_code_delete_data(status_code_data_t *data);
-#endif // _di_status_code_delete_data_
+#ifndef _di_status_code_data_delete_
+  extern f_status_t status_code_data_delete(status_code_data_t *data);
+#endif // _di_status_code_data_delete_
 
 #ifdef __cplusplus
 } // extern "C"