From f8c5f3c774df197ce1b93424f3207f9211e255b2 Mon Sep 17 00:00:00 2001
From: Kevin Day <thekevinday@gmail.com>
Date: Thu, 16 Dec 2021 15:57:55 -0600
Subject: [PATCH] Cleanup: Remove '_string' from the FSS write functions.

The read functions do not have _string().
This makes the code more consistent.
---
 level_1/fl_fss/c/fss_basic.c                       | 12 +++----
 level_1/fl_fss/c/fss_basic.h                       | 12 +++----
 level_1/fl_fss/c/fss_basic_list.c                  | 12 +++----
 level_1/fl_fss/c/fss_basic_list.h                  | 12 +++----
 level_1/fl_fss/c/fss_embedded_list.c               | 12 +++----
 level_1/fl_fss/c/fss_embedded_list.h               | 12 +++----
 level_1/fl_fss/c/fss_extended.c                    | 12 +++----
 level_1/fl_fss/c/fss_extended.h                    | 12 +++----
 level_1/fl_fss/c/fss_extended_list.c               | 12 +++----
 level_1/fl_fss/c/fss_extended_list.h               | 12 +++----
 level_1/fl_fss/c/private-fss.c                     | 16 ++++-----
 level_1/fl_fss/c/private-fss.h                     | 38 +++++++++++-----------
 level_2/fll_fss/c/fss_basic.c                      |  4 +--
 level_2/fll_fss/c/fss_basic.h                      |  4 +--
 level_2/fll_fss/c/fss_basic_list.c                 |  4 +--
 level_2/fll_fss/c/fss_basic_list.h                 |  4 +--
 level_2/fll_fss/c/fss_embedded_list.c              |  4 +--
 level_2/fll_fss/c/fss_embedded_list.h              |  4 +--
 level_2/fll_fss/c/fss_extended.c                   |  4 +--
 level_2/fll_fss/c/fss_extended.h                   |  4 +--
 level_2/fll_fss/c/fss_extended_list.c              |  4 +--
 level_2/fll_fss/c/fss_extended_list.h              |  4 +--
 .../c/private-fss_basic_list_write.c               |  8 ++---
 .../fss_basic_write/c/private-fss_basic_write.c    |  8 ++---
 .../c/private-fss_embedded_list_write.c            |  8 ++---
 .../c/private-fss_extended_list_write.c            |  8 ++---
 .../c/private-fss_extended_write.c                 |  8 ++---
 27 files changed, 127 insertions(+), 127 deletions(-)

diff --git a/level_1/fl_fss/c/fss_basic.c b/level_1/fl_fss/c/fss_basic.c
index 094caf3..18b4bc9 100644
--- a/level_1/fl_fss/c/fss_basic.c
+++ b/level_1/fl_fss/c/fss_basic.c
@@ -92,8 +92,8 @@ extern "C" {
   }
 #endif // _di_fl_fss_basic_content_read_
 
-#ifndef _di_fl_fss_basic_object_write_string_
-  f_status_t fl_fss_basic_object_write_string(const f_string_static_t object, const f_fss_quote_t quote, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
+#ifndef _di_fl_fss_basic_object_write_
+  f_status_t fl_fss_basic_object_write(const f_string_static_t object, const f_fss_quote_t quote, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
     #ifndef _di_level_1_parameter_checking_
       if (!range) return F_status_set_error(F_parameter);
       if (!destination) return F_status_set_error(F_parameter);
@@ -149,10 +149,10 @@ extern "C" {
 
     return status;
   }
-#endif // _di_fl_fss_basic_object_write_string_
+#endif // _di_fl_fss_basic_object_write_
 
-#ifndef _di_fl_fss_basic_content_write_string_
-  f_status_t fl_fss_basic_content_write_string(const f_string_static_t content, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
+#ifndef _di_fl_fss_basic_content_write_
+  f_status_t fl_fss_basic_content_write(const f_string_static_t content, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
     #ifndef _di_level_1_parameter_checking_
       if (!range) return F_status_set_error(F_parameter);
       if (!destination) return F_status_set_error(F_parameter);
@@ -219,7 +219,7 @@ extern "C" {
 
     return F_none_eos;
   }
-#endif // _di_fl_fss_basic_content_write_string_
+#endif // _di_fl_fss_basic_content_write_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_1/fl_fss/c/fss_basic.h b/level_1/fl_fss/c/fss_basic.h
index 22bbd30..1dcb9a5 100644
--- a/level_1/fl_fss/c/fss_basic.h
+++ b/level_1/fl_fss/c/fss_basic.h
@@ -184,9 +184,9 @@ extern "C" {
  *   Errors (with error bit) from: f_fss_is_space().
  *   Errors (with error bit) from: f_utf_buffer_increment().
  */
-#ifndef _di_fl_fss_basic_object_write_string_
-  extern f_status_t fl_fss_basic_object_write_string(const f_string_static_t object, const f_fss_quote_t quote, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination);
-#endif // _di_fl_fss_basic_object_write_string_
+#ifndef _di_fl_fss_basic_object_write_
+  extern f_status_t fl_fss_basic_object_write(const f_string_static_t object, const f_fss_quote_t quote, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination);
+#endif // _di_fl_fss_basic_object_write_
 
 /**
  * Write an fss-0000 content from a given string.
@@ -230,9 +230,9 @@ extern "C" {
  *   F_parameter (with error bit) if a parameter is invalid.
  *   F_string_too_large (with error bit) if appended string length is too large to store in the destination.
  */
-#ifndef _di_fl_fss_basic_content_write_string_
-  extern f_status_t fl_fss_basic_content_write_string(const f_string_static_t content, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination);
-#endif // _di_fl_fss_basic_content_write_string_
+#ifndef _di_fl_fss_basic_content_write_
+  extern f_status_t fl_fss_basic_content_write(const f_string_static_t content, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination);
+#endif // _di_fl_fss_basic_content_write_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_1/fl_fss/c/fss_basic_list.c b/level_1/fl_fss/c/fss_basic_list.c
index 73cf0a1..e56219d 100644
--- a/level_1/fl_fss/c/fss_basic_list.c
+++ b/level_1/fl_fss/c/fss_basic_list.c
@@ -539,8 +539,8 @@ extern "C" {
   }
 #endif // _di_fl_fss_basic_list_content_read_
 
-#ifndef _di_fl_fss_basic_list_object_write_string_
-  f_status_t fl_fss_basic_list_object_write_string(const f_string_static_t object, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
+#ifndef _di_fl_fss_basic_list_object_write_
+  f_status_t fl_fss_basic_list_object_write(const f_string_static_t object, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
     #ifndef _di_level_1_parameter_checking_
       if (!destination) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
@@ -753,10 +753,10 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_fl_fss_basic_list_object_write_string_
+#endif // _di_fl_fss_basic_list_object_write_
 
-#ifndef _di_fl_fss_basic_list_content_write_string_
-  f_status_t fl_fss_basic_list_content_write_string(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
+#ifndef _di_fl_fss_basic_list_content_write_
+  f_status_t fl_fss_basic_list_content_write(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
     #ifndef _di_level_1_parameter_checking_
       if (!range) return F_status_set_error(F_parameter);
       if (!destination) return F_status_set_error(F_parameter);
@@ -988,7 +988,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_fl_fss_basic_list_content_write_string_
+#endif // _di_fl_fss_basic_list_content_write_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_1/fl_fss/c/fss_basic_list.h b/level_1/fl_fss/c/fss_basic_list.h
index afb852f..7814e16 100644
--- a/level_1/fl_fss/c/fss_basic_list.h
+++ b/level_1/fl_fss/c/fss_basic_list.h
@@ -192,9 +192,9 @@ extern "C" {
  *
  *   Errors (with error bit) from: f_utf_buffer_increment().
  */
-#ifndef _di_fl_fss_basic_list_object_write_string_
-  extern f_status_t fl_fss_basic_list_object_write_string(const f_string_static_t object, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination);
-#endif // _di_fl_fss_basic_list_object_write_string_
+#ifndef _di_fl_fss_basic_list_object_write_
+  extern f_status_t fl_fss_basic_list_object_write(const f_string_static_t object, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination);
+#endif // _di_fl_fss_basic_list_object_write_
 
 /**
  * Write an fss-0002 content from a given string.
@@ -246,9 +246,9 @@ extern "C" {
  *
  *   Errors (with error bit) from: f_utf_buffer_increment().
  */
-#ifndef _di_fl_fss_basic_list_content_write_string_
-  extern f_status_t fl_fss_basic_list_content_write_string(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination);
-#endif // _di_fl_fss_basic_list_content_write_string_
+#ifndef _di_fl_fss_basic_list_content_write_
+  extern f_status_t fl_fss_basic_list_content_write(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination);
+#endif // _di_fl_fss_basic_list_content_write_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_1/fl_fss/c/fss_embedded_list.c b/level_1/fl_fss/c/fss_embedded_list.c
index baa2b32..6533484 100644
--- a/level_1/fl_fss/c/fss_embedded_list.c
+++ b/level_1/fl_fss/c/fss_embedded_list.c
@@ -958,8 +958,8 @@ extern "C" {
   }
 #endif // _di_fl_fss_embedded_list_content_read_
 
-#ifndef _di_fl_fss_embedded_list_object_write_string_
-  f_status_t fl_fss_embedded_list_object_write_string(const f_string_static_t object, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
+#ifndef _di_fl_fss_embedded_list_object_write_
+  f_status_t fl_fss_embedded_list_object_write(const f_string_static_t object, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
     #ifndef _di_level_1_parameter_checking_
       if (!destination) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
@@ -1190,10 +1190,10 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_fl_fss_embedded_list_object_write_string_
+#endif // _di_fl_fss_embedded_list_object_write_
 
-#ifndef _di_fl_fss_embedded_list_content_write_string_
-  f_status_t fl_fss_embedded_list_content_write_string(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, const f_string_ranges_t *ignore, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
+#ifndef _di_fl_fss_embedded_list_content_write_
+  f_status_t fl_fss_embedded_list_content_write(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, const f_string_ranges_t *ignore, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
     #ifndef _di_level_1_parameter_checking_
       if (!range) return F_status_set_error(F_parameter);
       if (!destination) return F_status_set_error(F_parameter);
@@ -1466,7 +1466,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_fl_fss_embedded_list_content_write_string_
+#endif // _di_fl_fss_embedded_list_content_write_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_1/fl_fss/c/fss_embedded_list.h b/level_1/fl_fss/c/fss_embedded_list.h
index 16c5050..b30ab06 100644
--- a/level_1/fl_fss/c/fss_embedded_list.h
+++ b/level_1/fl_fss/c/fss_embedded_list.h
@@ -195,9 +195,9 @@ extern "C" {
  *
  *   Errors (with error bit) from: f_utf_buffer_increment().
  */
-#ifndef _di_fl_fss_embedded_list_object_write_string_
-  extern f_status_t fl_fss_embedded_list_object_write_string(const f_string_static_t object, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination);
-#endif // _di_fl_fss_embedded_list_object_write_string_
+#ifndef _di_fl_fss_embedded_list_object_write_
+  extern f_status_t fl_fss_embedded_list_object_write(const f_string_static_t object, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination);
+#endif // _di_fl_fss_embedded_list_object_write_
 
 /**
  * Write an fss-0008 content from a given string.
@@ -253,9 +253,9 @@ extern "C" {
  *
  *   Errors (with error bit) from: f_utf_buffer_increment().
  */
-#ifndef _di_fl_fss_embedded_list_content_write_string_
-  extern f_status_t fl_fss_embedded_list_content_write_string(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, const f_string_ranges_t *ignore, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination);
-#endif // _di_fl_fss_embedded_list_content_write_string_
+#ifndef _di_fl_fss_embedded_list_content_write_
+  extern f_status_t fl_fss_embedded_list_content_write(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, const f_string_ranges_t *ignore, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination);
+#endif // _di_fl_fss_embedded_list_content_write_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_1/fl_fss/c/fss_extended.c b/level_1/fl_fss/c/fss_extended.c
index d720654..bfa61a5 100644
--- a/level_1/fl_fss/c/fss_extended.c
+++ b/level_1/fl_fss/c/fss_extended.c
@@ -145,8 +145,8 @@ extern "C" {
   }
 #endif // _di_fl_fss_extended_content_read_
 
-#ifndef _di_fl_fss_extended_object_write_string_
-f_status_t fl_fss_extended_object_write_string(const f_string_static_t object, const f_fss_quote_t quote, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
+#ifndef _di_fl_fss_extended_object_write_
+f_status_t fl_fss_extended_object_write(const f_string_static_t object, const f_fss_quote_t quote, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
     #ifndef _di_level_1_parameter_checking_
       if (!range) return F_status_set_error(F_parameter);
       if (!destination) return F_status_set_error(F_parameter);
@@ -184,10 +184,10 @@ f_status_t fl_fss_extended_object_write_string(const f_string_static_t object, c
 
     return status;
   }
-#endif // _di_fl_fss_extended_object_write_string_
+#endif // _di_fl_fss_extended_object_write_
 
-#ifndef _di_fl_fss_extended_content_write_string_
-  f_status_t fl_fss_extended_content_write_string(const f_string_static_t content, const f_fss_quote_t quote, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
+#ifndef _di_fl_fss_extended_content_write_
+  f_status_t fl_fss_extended_content_write(const f_string_static_t content, const f_fss_quote_t quote, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
     #ifndef _di_level_1_parameter_checking_
       if (!range) return F_status_set_error(F_parameter);
       if (!destination) return F_status_set_error(F_parameter);
@@ -236,7 +236,7 @@ f_status_t fl_fss_extended_object_write_string(const f_string_static_t object, c
 
     return status;
   }
-#endif // _di_fl_fss_extended_content_write_string_
+#endif // _di_fl_fss_extended_content_write_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_1/fl_fss/c/fss_extended.h b/level_1/fl_fss/c/fss_extended.h
index b589bda..5b4ccd5 100644
--- a/level_1/fl_fss/c/fss_extended.h
+++ b/level_1/fl_fss/c/fss_extended.h
@@ -188,9 +188,9 @@ extern "C" {
  *   Errors (with error bit) from: f_fss_is_space().
  *   Errors (with error bit) from: f_utf_buffer_increment().
  */
-#ifndef _di_fl_fss_extended_object_write_string_
-  extern f_status_t fl_fss_extended_object_write_string(const f_string_static_t object, const f_fss_quote_t quote, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination);
-#endif // _di_fl_fss_extended_object_write_string_
+#ifndef _di_fl_fss_extended_object_write_
+  extern f_status_t fl_fss_extended_object_write(const f_string_static_t object, const f_fss_quote_t quote, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination);
+#endif // _di_fl_fss_extended_object_write_
 
 /**
  * Write an fss-0001 content from a given string.
@@ -243,9 +243,9 @@ extern "C" {
  *   Errors (with error bit) from: f_fss_is_space().
  *   Errors (with error bit) from: f_utf_buffer_increment().
  */
-#ifndef _di_fl_fss_extended_content_write_string_
-  extern f_status_t fl_fss_extended_content_write_string(const f_string_static_t content, const f_fss_quote_t quote, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination);
-#endif // _di_fl_fss_extended_content_write_string_
+#ifndef _di_fl_fss_extended_content_write_
+  extern f_status_t fl_fss_extended_content_write(const f_string_static_t content, const f_fss_quote_t quote, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination);
+#endif // _di_fl_fss_extended_content_write_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_1/fl_fss/c/fss_extended_list.c b/level_1/fl_fss/c/fss_extended_list.c
index a486110..9834a30 100644
--- a/level_1/fl_fss/c/fss_extended_list.c
+++ b/level_1/fl_fss/c/fss_extended_list.c
@@ -511,8 +511,8 @@ extern "C" {
   }
 #endif // _di_fl_fss_extended_list_content_read_
 
-#ifndef _di_fl_fss_extended_list_object_write_string_
-  f_status_t fl_fss_extended_list_object_write_string(const f_string_static_t object, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
+#ifndef _di_fl_fss_extended_list_object_write_
+  f_status_t fl_fss_extended_list_object_write(const f_string_static_t object, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
     #ifndef _di_level_1_parameter_checking_
       if (!destination) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
@@ -742,10 +742,10 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_fl_fss_extended_list_object_write_string_
+#endif // _di_fl_fss_extended_list_object_write_
 
-#ifndef _di_fl_fss_extended_list_content_write_string_
-  f_status_t fl_fss_extended_list_content_write_string(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, const f_string_ranges_t *ignore, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
+#ifndef _di_fl_fss_extended_list_content_write_
+  f_status_t fl_fss_extended_list_content_write(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, const f_string_ranges_t *ignore, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
     #ifndef _di_level_1_parameter_checking_
       if (!range) return F_status_set_error(F_parameter);
       if (!destination) return F_status_set_error(F_parameter);
@@ -1017,7 +1017,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_fl_fss_extended_list_content_write_string_
+#endif // _di_fl_fss_extended_list_content_write_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_1/fl_fss/c/fss_extended_list.h b/level_1/fl_fss/c/fss_extended_list.h
index c2cbfc8..e25e012 100644
--- a/level_1/fl_fss/c/fss_extended_list.h
+++ b/level_1/fl_fss/c/fss_extended_list.h
@@ -193,9 +193,9 @@ extern "C" {
  *
  *   Errors (with error bit) from: f_utf_buffer_increment().
  */
-#ifndef _di_fl_fss_extended_list_object_write_string_
-  extern f_status_t fl_fss_extended_list_object_write_string(const f_string_static_t object, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination);
-#endif // _di_fl_fss_extended_list_object_write_string_
+#ifndef _di_fl_fss_extended_list_object_write_
+  extern f_status_t fl_fss_extended_list_object_write(const f_string_static_t object, const uint8_t complete, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination);
+#endif // _di_fl_fss_extended_list_object_write_
 
 /**
  * Write an fss-0003 content from a given string.
@@ -251,9 +251,9 @@ extern "C" {
  *
  *   Errors (with error bit) from: f_utf_buffer_increment().
  */
-#ifndef _di_fl_fss_extended_list_content_write_string_
-  extern f_status_t fl_fss_extended_list_content_write_string(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, const f_string_ranges_t *ignore, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination);
-#endif // _di_fl_fss_extended_list_content_write_string_
+#ifndef _di_fl_fss_extended_list_content_write_
+  extern f_status_t fl_fss_extended_list_content_write(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, const f_string_ranges_t *ignore, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination);
+#endif // _di_fl_fss_extended_list_content_write_
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_1/fl_fss/c/private-fss.c b/level_1/fl_fss/c/private-fss.c
index 8adf3ac..830bd50 100644
--- a/level_1/fl_fss/c/private-fss.c
+++ b/level_1/fl_fss/c/private-fss.c
@@ -6,7 +6,7 @@
 extern "C" {
 #endif
 
-#if !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_extended_object_write_string_)
+#if !defined(_di_fl_fss_basic_object_write_) || !defined(_di_fl_fss_extended_object_write_)
   f_status_t private_fl_fss_basic_write_object_trim(const f_fss_quote_t quote, const f_array_length_t used_start, f_state_t state, f_string_dynamic_t *destination) {
 
     f_status_t status = F_none;
@@ -156,9 +156,9 @@ extern "C" {
 
     return F_none;
   }
-#endif // !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_extended_object_write_string_)
+#endif // !defined(_di_fl_fss_basic_object_write_) || !defined(_di_fl_fss_extended_object_write_)
 
-#if !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_content_write_string_)
+#if !defined(_di_fl_fss_basic_list_content_write_) || !defined(_di_fl_fss_extended_list_content_write_) || !defined(_di_fl_fss_embedded_list_content_write_)
   f_status_t private_fl_fss_basic_list_write_add_until_end(const f_string_static_t buffer, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
 
     f_status_t status = F_none;
@@ -184,9 +184,9 @@ extern "C" {
 
     return status;
   }
-#endif // !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_content_write_string_)
+#endif // !defined(_di_fl_fss_basic_list_content_write_) || !defined(_di_fl_fss_extended_list_content_write_) || !defined(_di_fl_fss_embedded_list_content_write_)
 
-#if !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_)
+#if !defined(_di_fl_fss_basic_list_object_write_) || !defined(_di_fl_fss_extended_list_object_write_)
   f_status_t private_fl_fss_basic_list_write_object_trim(const f_array_length_t used_start, f_state_t state, f_string_dynamic_t *destination) {
 
     f_status_t status = F_none;
@@ -274,7 +274,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_)
+#endif // !defined(_di_fl_fss_basic_list_object_write_) || !defined(_di_fl_fss_extended_list_object_write_)
 
 #if !defined(_di_fl_fss_basic_object_read_) || !defined(_di_fl_fss_extended_object_read_) || !defined(_di_fl_fss_extended_content_read_)
   f_status_t private_fl_fss_basic_read(const f_string_static_t buffer, const bool object_as, f_state_t state, f_string_range_t *range, f_fss_object_t *found, f_fss_quote_t *quote, f_fss_delimits_t *delimits) {
@@ -845,7 +845,7 @@ extern "C" {
   }
 #endif // !defined(_di_fl_fss_basic_object_read_) || !defined(_di_fl_fss_extended_object_read_)
 
-#if !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) || !defined(_di_fl_fss_extended_content_write_string_)
+#if !defined(_di_fl_fss_basic_object_write_) || !defined(_di_fl_fss_extended_object_write_) || !defined(_di_fl_fss_extended_content_write_)
   f_status_t private_fl_fss_basic_write(const bool object_as, const f_string_static_t object, const f_fss_quote_t quote, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) {
 
     f_status_t status = f_fss_skip_past_space(object, range);
@@ -1218,7 +1218,7 @@ extern "C" {
 
     return F_none_eos;
   }
-#endif // !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) || !defined(_di_fl_fss_extended_content_write_string_)
+#endif // !defined(_di_fl_fss_basic_object_write_) || !defined(_di_fl_fss_extended_object_write_) || !defined(_di_fl_fss_extended_content_write_)
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_1/fl_fss/c/private-fss.h b/level_1/fl_fss/c/private-fss.h
index b94e790..9ea28d8 100644
--- a/level_1/fl_fss/c/private-fss.h
+++ b/level_1/fl_fss/c/private-fss.h
@@ -42,12 +42,12 @@ extern "C" {
  *
  *   Errors (with error bit) from: f_fss_is_space().
  *
- * @see fl_fss_basic_object_write_string()
- * @see fl_fss_extended_object_write_string()
+ * @see fl_fss_basic_object_write()
+ * @see fl_fss_extended_object_write()
  */
-#if !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_extended_object_write_string_)
+#if !defined(_di_fl_fss_basic_object_write_) || !defined(_di_fl_fss_extended_object_write_)
   extern f_status_t private_fl_fss_basic_write_object_trim(const f_fss_quote_t quote, const f_array_length_t used_start, f_state_t state, f_string_dynamic_t *destination) F_attribute_visibility_internal_d;
-#endif // !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_extended_object_write_string_)
+#endif // !defined(_di_fl_fss_basic_object_write_) || !defined(_di_fl_fss_extended_object_write_)
 
 /**
  * Add all bytes to destination until stop point, buffer end, or EOL.
@@ -75,14 +75,14 @@ extern "C" {
  *
  *   Errors (with error bit) from: f_string_dynamic_increase().
  *
- * @see fl_fss_basic_list_content_write_string()
- * @see fl_fss_embedded_list_content_write_string()
- * @see fl_fss_extended_list_content_write_string()
+ * @see fl_fss_basic_list_content_write()
+ * @see fl_fss_embedded_list_content_write()
+ * @see fl_fss_extended_list_content_write()
  * @see f_string_dynamic_increase()
  */
-#if !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_content_write_string_)
+#if !defined(_di_fl_fss_basic_list_content_write_) || !defined(_di_fl_fss_extended_list_content_write_) || !defined(_di_fl_fss_embedded_list_content_write_)
   extern f_status_t private_fl_fss_basic_list_write_add_until_end(const f_string_static_t buffer, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) F_attribute_visibility_internal_d;
-#endif // !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_content_write_string_)
+#endif // !defined(_di_fl_fss_basic_list_content_write_) || !defined(_di_fl_fss_extended_list_content_write_) || !defined(_di_fl_fss_embedded_list_content_write_)
 
 /**
  * Trim a given object used by the basic list and extended list object write functions.
@@ -108,12 +108,12 @@ extern "C" {
  *
  *   Errors (with error bit) from: f_fss_is_space().
  *
- * @see fl_fss_basic_list_object_write_string()
- * @see fl_fss_extended_list_object_write_string()
+ * @see fl_fss_basic_list_object_write()
+ * @see fl_fss_extended_list_object_write()
  */
-#if !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_)
+#if !defined(_di_fl_fss_basic_list_object_write_) || !defined(_di_fl_fss_extended_list_object_write_)
   extern f_status_t private_fl_fss_basic_list_write_object_trim(const f_array_length_t used_start, f_state_t state, f_string_dynamic_t *destination) F_attribute_visibility_internal_d;
-#endif // !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_)
+#endif // !defined(_di_fl_fss_basic_list_object_write_) || !defined(_di_fl_fss_extended_list_object_write_)
 
 /**
  * Private implementation of fl_fss_basic_object_read().
@@ -186,7 +186,7 @@ extern "C" {
 #endif // !defined(_di_fl_fss_basic_object_read_) || !defined(_di_fl_fss_extended_object_read_) || !defined(_di_fl_fss_extended_content_read_)
 
 /**
- * Private implementation of fl_fss_basic_object_write_string().
+ * Private implementation of fl_fss_basic_object_write().
  *
  * Intended to be shared to each of the different implementation variations.
  *
@@ -234,13 +234,13 @@ extern "C" {
  *
  *   Errors (with error bit) from: f_utf_buffer_increment().
  *
- * @see fl_fss_basic_object_write_string()
- * @see fl_fss_extended_object_write_string()
- * @see fl_fss_extended_content_write_string()
+ * @see fl_fss_basic_object_write()
+ * @see fl_fss_extended_object_write()
+ * @see fl_fss_extended_content_write()
  */
-#if !defined(fl_fss_basic_object_write_string) || !defined(fl_fss_extended_object_write_string) || !defined(_di_fl_fss_extended_content_write_string_)
+#if !defined(fl_fss_basic_object_write) || !defined(fl_fss_extended_object_write) || !defined(_di_fl_fss_extended_content_write_)
   extern f_status_t private_fl_fss_basic_write(const bool object_as, const f_string_static_t object, const f_fss_quote_t quoted, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) F_attribute_visibility_internal_d;
-#endif // !defined(fl_fss_basic_object_write_string) || !defined(fl_fss_extended_object_write_string) || !defined(_di_fl_fss_extended_content_write_string_)
+#endif // !defined(fl_fss_basic_object_write) || !defined(fl_fss_extended_object_write) || !defined(_di_fl_fss_extended_content_write_)
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/level_2/fll_fss/c/fss_basic.c b/level_2/fll_fss/c/fss_basic.c
index 5fa5d56..09f4f3b 100644
--- a/level_2/fll_fss/c/fss_basic.c
+++ b/level_2/fll_fss/c/fss_basic.c
@@ -162,7 +162,7 @@ extern "C" {
     f_status_t status = 0;
     f_string_range_t range = macro_f_string_range_t_initialize(object.used);
 
-    status = fl_fss_basic_object_write_string(object, quote, f_fss_complete_full, state, &range, destination);
+    status = fl_fss_basic_object_write(object, quote, f_fss_complete_full, state, &range, destination);
 
     if (F_status_is_error(status) || status == F_data_not_stop || status == F_data_not_eos) {
       return status;
@@ -173,7 +173,7 @@ extern "C" {
         range.start = 0;
         range.stop = content.used - 1;
 
-        status = fl_fss_basic_content_write_string(content, f_fss_complete_full, state, &range, destination);
+        status = fl_fss_basic_content_write(content, f_fss_complete_full, state, &range, destination);
         if (F_status_is_error(status)) return status;
       }
       else {
diff --git a/level_2/fll_fss/c/fss_basic.h b/level_2/fll_fss/c/fss_basic.h
index bd4553b..1916801 100644
--- a/level_2/fll_fss/c/fss_basic.h
+++ b/level_2/fll_fss/c/fss_basic.h
@@ -116,8 +116,8 @@ extern "C" {
  *   F_parameter (with error bit) if a parameter is invalid.
  *   F_utf (with error bit) is returned on failure to read/process a UTF-8 character.
  *
- *   Errors (with error bit) from: fl_fss_basic_content_write_string().
- *   Errors (with error bit) from: fl_fss_basic_object_write_string().
+ *   Errors (with error bit) from: fl_fss_basic_content_write().
+ *   Errors (with error bit) from: fl_fss_basic_object_write().
  *   Errors (with error bit) from: f_string_dynamic_increase_by().
  */
 #ifndef _di_fll_fss_basic_write_string_
diff --git a/level_2/fll_fss/c/fss_basic_list.c b/level_2/fll_fss/c/fss_basic_list.c
index a6b8af3..4351da7 100644
--- a/level_2/fll_fss/c/fss_basic_list.c
+++ b/level_2/fll_fss/c/fss_basic_list.c
@@ -136,7 +136,7 @@ extern "C" {
     f_status_t status = 0;
     f_string_range_t range = macro_f_string_range_t_initialize(object.used);
 
-    status = fl_fss_basic_list_object_write_string(object, f_fss_complete_full, state, &range, destination);
+    status = fl_fss_basic_list_object_write(object, f_fss_complete_full, state, &range, destination);
 
     if (F_status_is_error(status) || status == F_data_not_stop || status == F_data_not_eos) {
       return status;
@@ -152,7 +152,7 @@ extern "C" {
         range.stop = 0;
       }
 
-      status = fl_fss_basic_list_content_write_string(content, f_fss_complete_full, content_prepend, state, &range, destination);
+      status = fl_fss_basic_list_content_write(content, f_fss_complete_full, content_prepend, state, &range, destination);
     }
 
     return status;
diff --git a/level_2/fll_fss/c/fss_basic_list.h b/level_2/fll_fss/c/fss_basic_list.h
index 1cb44b3..d76e0a2 100644
--- a/level_2/fll_fss/c/fss_basic_list.h
+++ b/level_2/fll_fss/c/fss_basic_list.h
@@ -115,8 +115,8 @@ extern "C" {
  *   F_parameter (with error bit) if a parameter is invalid.
  *   F_utf (with error bit) is returned on failure to read/process a UTF-8 character.
  *
- *   Errors (with error bit) from: fl_fss_basic_list_content_write_string().
- *   Errors (with error bit) from: fl_fss_basic_list_object_write_string().
+ *   Errors (with error bit) from: fl_fss_basic_list_content_write().
+ *   Errors (with error bit) from: fl_fss_basic_list_object_write().
  *   Errors (with error bit) from: f_string_dynamic_increase_by().
  */
 #ifndef _di_fll_fss_basic_list_write_string_
diff --git a/level_2/fll_fss/c/fss_embedded_list.c b/level_2/fll_fss/c/fss_embedded_list.c
index e5922ec..0d709bb 100644
--- a/level_2/fll_fss/c/fss_embedded_list.c
+++ b/level_2/fll_fss/c/fss_embedded_list.c
@@ -134,7 +134,7 @@ extern "C" {
     f_status_t status = 0;
     f_string_range_t range = macro_f_string_range_t_initialize(object.used);
 
-    status = fl_fss_embedded_list_object_write_string(object, f_fss_complete_full, state, &range, destination);
+    status = fl_fss_embedded_list_object_write(object, f_fss_complete_full, state, &range, destination);
 
     if (F_status_is_error(status) || status == F_data_not_stop || status == F_data_not_eos) {
       return status;
@@ -150,7 +150,7 @@ extern "C" {
         range.stop = 0;
       }
 
-      status = fl_fss_embedded_list_content_write_string(content, f_fss_complete_full, content_prepend, ignore, state, &range, destination);
+      status = fl_fss_embedded_list_content_write(content, f_fss_complete_full, content_prepend, ignore, state, &range, destination);
     }
 
     return status;
diff --git a/level_2/fll_fss/c/fss_embedded_list.h b/level_2/fll_fss/c/fss_embedded_list.h
index 5b53b3a..a7b542a 100644
--- a/level_2/fll_fss/c/fss_embedded_list.h
+++ b/level_2/fll_fss/c/fss_embedded_list.h
@@ -124,8 +124,8 @@ extern "C" {
  *   F_parameter (with error bit) if a parameter is invalid.
  *   F_utf (with error bit) is returned on failure to read/process a UTF-8 character.
  *
- *   Errors (with error bit) from: fl_fss_embedded_list_content_write_string().
- *   Errors (with error bit) from: fl_fss_embedded_list_object_write_string().
+ *   Errors (with error bit) from: fl_fss_embedded_list_content_write().
+ *   Errors (with error bit) from: fl_fss_embedded_list_object_write().
  *   Errors (with error bit) from: f_string_dynamic_increase_by().
  */
 #ifndef _di_fll_fss_embedded_list_write_string_
diff --git a/level_2/fll_fss/c/fss_extended.c b/level_2/fll_fss/c/fss_extended.c
index 69ed891..d3c628d 100644
--- a/level_2/fll_fss/c/fss_extended.c
+++ b/level_2/fll_fss/c/fss_extended.c
@@ -201,7 +201,7 @@ extern "C" {
     f_status_t status = 0;
     f_string_range_t range = macro_f_string_range_t_initialize(object.used);
 
-    status = fl_fss_extended_object_write_string(object, quote, f_fss_complete_full, state, &range, destination);
+    status = fl_fss_extended_object_write(object, quote, f_fss_complete_full, state, &range, destination);
 
     if (F_status_is_error(status) || status == F_data_not_stop || status == F_data_not_eos) {
       return status;
@@ -225,7 +225,7 @@ extern "C" {
           range.stop = 0;
         }
 
-        status = fl_fss_extended_content_write_string(contents.array[i], quote, complete, state, &range, destination);
+        status = fl_fss_extended_content_write(contents.array[i], quote, complete, state, &range, destination);
         if (F_status_is_error(status)) return status;
       } // for
     }
diff --git a/level_2/fll_fss/c/fss_extended.h b/level_2/fll_fss/c/fss_extended.h
index 9a592e9..b19708b 100644
--- a/level_2/fll_fss/c/fss_extended.h
+++ b/level_2/fll_fss/c/fss_extended.h
@@ -117,8 +117,8 @@ extern "C" {
  *   F_parameter (with error bit) if a parameter is invalid.
  *   F_utf (with error bit) is returned on failure to read/process a UTF-8 character.
  *
- *   Errors (with error bit) from: fl_fss_extended_content_write_string().
- *   Errors (with error bit) from: fl_fss_extended_object_write_string().
+ *   Errors (with error bit) from: fl_fss_extended_content_write().
+ *   Errors (with error bit) from: fl_fss_extended_object_write().
  *   Errors (with error bit) from: f_string_dynamic_increase_by().
  */
 #ifndef _di_fll_fss_extended_write_string_
diff --git a/level_2/fll_fss/c/fss_extended_list.c b/level_2/fll_fss/c/fss_extended_list.c
index abb13c5..d439127 100644
--- a/level_2/fll_fss/c/fss_extended_list.c
+++ b/level_2/fll_fss/c/fss_extended_list.c
@@ -136,7 +136,7 @@ extern "C" {
     f_status_t status = 0;
     f_string_range_t range = macro_f_string_range_t_initialize(object.used);
 
-    status = fl_fss_extended_list_object_write_string(object, f_fss_complete_full, state, &range, destination);
+    status = fl_fss_extended_list_object_write(object, f_fss_complete_full, state, &range, destination);
 
     if (F_status_is_error(status) || status == F_data_not_stop || status == F_data_not_eos) {
       return status;
@@ -152,7 +152,7 @@ extern "C" {
         range.stop = 0;
       }
 
-      status = fl_fss_extended_list_content_write_string(content, f_fss_complete_full, content_prepend, ignore, state, &range, destination);
+      status = fl_fss_extended_list_content_write(content, f_fss_complete_full, content_prepend, ignore, state, &range, destination);
     }
 
     return status;
diff --git a/level_2/fll_fss/c/fss_extended_list.h b/level_2/fll_fss/c/fss_extended_list.h
index 53f325d..1bc7fc8 100644
--- a/level_2/fll_fss/c/fss_extended_list.h
+++ b/level_2/fll_fss/c/fss_extended_list.h
@@ -128,8 +128,8 @@ extern "C" {
  *   F_parameter (with error bit) if a parameter is invalid.
  *   F_utf (with error bit) is returned on failure to read/process a UTF-8 character.
  *
- *   Errors (with error bit) from: fl_fss_extended_list_content_write_string().
- *   Errors (with error bit) from: fl_fss_extended_list_object_write_string().
+ *   Errors (with error bit) from: fl_fss_extended_list_content_write().
+ *   Errors (with error bit) from: fl_fss_extended_list_object_write().
  *   Errors (with error bit) from: f_string_dynamic_increase_by().
  */
 #ifndef _di_fll_fss_extended_list_write_string_
diff --git a/level_3/fss_basic_list_write/c/private-fss_basic_list_write.c b/level_3/fss_basic_list_write/c/private-fss_basic_list_write.c
index 213ce23..a27c265 100644
--- a/level_3/fss_basic_list_write/c/private-fss_basic_list_write.c
+++ b/level_3/fss_basic_list_write/c/private-fss_basic_list_write.c
@@ -89,7 +89,7 @@ extern "C" {
         }
       }
 
-      status = fl_fss_basic_list_object_write_string(*object, complete, state, &range, buffer);
+      status = fl_fss_basic_list_object_write(*object, complete, state, &range, buffer);
 
       if (F_status_set_fine(status) == F_none_eol) {
         fss_basic_list_write_error_parameter_unsupported_eol_print(main);
@@ -98,7 +98,7 @@ extern "C" {
       }
 
       if (F_status_is_error(status)) {
-        fll_error_print(main->error, F_status_set_fine(status), "fl_fss_basic_list_object_write_string", F_true);
+        fll_error_print(main->error, F_status_set_fine(status), "fl_fss_basic_list_object_write", F_true);
 
         return status;
       }
@@ -108,10 +108,10 @@ extern "C" {
       range.start = 0;
       range.stop = content->used - 1;
 
-      status = fl_fss_basic_list_content_write_string(*content, object ? f_fss_complete_full : f_fss_complete_none, &main->prepend, state, &range, buffer);
+      status = fl_fss_basic_list_content_write(*content, object ? f_fss_complete_full : f_fss_complete_none, &main->prepend, state, &range, buffer);
 
       if (F_status_is_error(status)) {
-        fll_error_print(main->error, F_status_set_fine(status), "fl_fss_basic_list_content_write_string", F_true);
+        fll_error_print(main->error, F_status_set_fine(status), "fl_fss_basic_list_content_write", F_true);
 
         return status;
       }
diff --git a/level_3/fss_basic_write/c/private-fss_basic_write.c b/level_3/fss_basic_write/c/private-fss_basic_write.c
index 98a0afe..33b2f87 100644
--- a/level_3/fss_basic_write/c/private-fss_basic_write.c
+++ b/level_3/fss_basic_write/c/private-fss_basic_write.c
@@ -89,7 +89,7 @@ extern "C" {
         }
       }
 
-      status = fl_fss_basic_object_write_string(*object, quote, complete, state, &range, buffer);
+      status = fl_fss_basic_object_write(*object, quote, complete, state, &range, buffer);
 
       if (F_status_set_fine(status) == F_none_eol) {
         fss_basic_write_error_parameter_unsupported_eol_print(main);
@@ -98,7 +98,7 @@ extern "C" {
       }
 
       if (F_status_is_error(status)) {
-        fll_error_print(main->error, F_status_set_fine(status), "fl_fss_basic_object_write_string", F_true);
+        fll_error_print(main->error, F_status_set_fine(status), "fl_fss_basic_object_write", F_true);
 
         return status;
       }
@@ -114,7 +114,7 @@ extern "C" {
         range.stop = 0;
       }
 
-      status = fl_fss_basic_content_write_string(*content, object ? f_fss_complete_full : f_fss_complete_none, state, &range, buffer);
+      status = fl_fss_basic_content_write(*content, object ? f_fss_complete_full : f_fss_complete_none, state, &range, buffer);
 
       if (F_status_set_fine(status) == F_none_eol) {
         fss_basic_write_error_parameter_unsupported_eol_print(main);
@@ -123,7 +123,7 @@ extern "C" {
       }
 
       if (F_status_is_error(status)) {
-        fll_error_print(main->error, F_status_set_fine(status), "fl_fss_basic_content_write_string", F_true);
+        fll_error_print(main->error, F_status_set_fine(status), "fl_fss_basic_content_write", F_true);
 
         return status;
       }
diff --git a/level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.c b/level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.c
index a01f265..1384aee 100644
--- a/level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.c
+++ b/level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.c
@@ -89,7 +89,7 @@ extern "C" {
         }
       }
 
-      status = fl_fss_embedded_list_object_write_string(*object, complete, state, &range, buffer);
+      status = fl_fss_embedded_list_object_write(*object, complete, state, &range, buffer);
 
       if (F_status_set_fine(status) == F_none_eol) {
         fss_embedded_list_write_error_parameter_unsupported_eol_print(main);
@@ -98,7 +98,7 @@ extern "C" {
       }
 
       if (F_status_is_error(status)) {
-        fll_error_print(main->error, F_status_set_fine(status), "fl_fss_embedded_list_object_write_string", F_true);
+        fll_error_print(main->error, F_status_set_fine(status), "fl_fss_embedded_list_object_write", F_true);
 
         return status;
       }
@@ -108,10 +108,10 @@ extern "C" {
       range.start = 0;
       range.stop = content->used - 1;
 
-      status = fl_fss_embedded_list_content_write_string(*content, object ? f_fss_complete_full : f_fss_complete_none, &main->prepend, ignore, state, &range, buffer);
+      status = fl_fss_embedded_list_content_write(*content, object ? f_fss_complete_full : f_fss_complete_none, &main->prepend, ignore, state, &range, buffer);
 
       if (F_status_is_error(status)) {
-        fll_error_print(main->error, F_status_set_fine(status), "fl_fss_embedded_list_content_write_string", F_true);
+        fll_error_print(main->error, F_status_set_fine(status), "fl_fss_embedded_list_content_write", F_true);
 
         return status;
       }
diff --git a/level_3/fss_extended_list_write/c/private-fss_extended_list_write.c b/level_3/fss_extended_list_write/c/private-fss_extended_list_write.c
index a00b35e..c7339e9 100644
--- a/level_3/fss_extended_list_write/c/private-fss_extended_list_write.c
+++ b/level_3/fss_extended_list_write/c/private-fss_extended_list_write.c
@@ -89,7 +89,7 @@ extern "C" {
         }
       }
 
-      status = fl_fss_extended_list_object_write_string(*object, complete, state, &range, buffer);
+      status = fl_fss_extended_list_object_write(*object, complete, state, &range, buffer);
 
       if (F_status_set_fine(status) == F_none_eol) {
         fss_extended_list_write_error_parameter_unsupported_eol_print(main);
@@ -98,7 +98,7 @@ extern "C" {
       }
 
       if (F_status_is_error(status)) {
-        fll_error_print(main->error, F_status_set_fine(status), "fl_fss_extended_list_object_write_string", F_true);
+        fll_error_print(main->error, F_status_set_fine(status), "fl_fss_extended_list_object_write", F_true);
 
         return status;
       }
@@ -108,10 +108,10 @@ extern "C" {
       range.start = 0;
       range.stop = content->used - 1;
 
-      status = fl_fss_extended_list_content_write_string(*content, object ? f_fss_complete_full : f_fss_complete_none, &main->prepend, ignore, state, &range, buffer);
+      status = fl_fss_extended_list_content_write(*content, object ? f_fss_complete_full : f_fss_complete_none, &main->prepend, ignore, state, &range, buffer);
 
       if (F_status_is_error(status)) {
-        fll_error_print(main->error, F_status_set_fine(status), "fl_fss_extended_list_content_write_string", F_true);
+        fll_error_print(main->error, F_status_set_fine(status), "fl_fss_extended_list_content_write", F_true);
 
         return status;
       }
diff --git a/level_3/fss_extended_write/c/private-fss_extended_write.c b/level_3/fss_extended_write/c/private-fss_extended_write.c
index 3f990fb..ce55948 100644
--- a/level_3/fss_extended_write/c/private-fss_extended_write.c
+++ b/level_3/fss_extended_write/c/private-fss_extended_write.c
@@ -89,7 +89,7 @@ extern "C" {
         }
       }
 
-      status = fl_fss_extended_object_write_string(*object, quote, complete, state, &range, buffer);
+      status = fl_fss_extended_object_write(*object, quote, complete, state, &range, buffer);
 
       if (F_status_set_fine(status) == F_none_eol) {
         fss_extended_write_error_parameter_unsupported_eol_print(main);
@@ -98,7 +98,7 @@ extern "C" {
       }
 
       if (F_status_is_error(status)) {
-        fll_error_print(main->error, F_status_set_fine(status), "fl_fss_extended_object_write_string", F_true);
+        fll_error_print(main->error, F_status_set_fine(status), "fl_fss_extended_object_write", F_true);
 
         return F_status_set_error(status);
       }
@@ -117,7 +117,7 @@ extern "C" {
             range.stop = 0;
           }
 
-          status = fl_fss_extended_content_write_string(contents->array[i], quote, i + 1 < contents->used ? f_fss_complete_next : f_fss_complete_end, state, &range, buffer);
+          status = fl_fss_extended_content_write(contents->array[i], quote, i + 1 < contents->used ? f_fss_complete_next : f_fss_complete_end, state, &range, buffer);
 
           if (F_status_set_fine(status) == F_none_eol) {
             fss_extended_write_error_parameter_unsupported_eol_print(main);
@@ -126,7 +126,7 @@ extern "C" {
           }
 
           if (F_status_is_error(status)) {
-            fll_error_print(main->error, F_status_set_fine(status), "fl_fss_extended_content_write_string", F_true);
+            fll_error_print(main->error, F_status_set_fine(status), "fl_fss_extended_content_write", F_true);
 
             return F_status_set_error(status);
           }
-- 
1.8.3.1