diff --git a/components/core/src/clp/ffi/KeyValuePairLogEvent.cpp b/components/core/src/clp/ffi/KeyValuePairLogEvent.cpp
index 53fee24f5..e55860aba 100644
--- a/components/core/src/clp/ffi/KeyValuePairLogEvent.cpp
+++ b/components/core/src/clp/ffi/KeyValuePairLogEvent.cpp
@@ -560,41 +560,41 @@ auto KeyValuePairLogEvent::create(
     };
 }
 
-auto KeyValuePairLogEvent::get_auto_generated_schema_subtree_bitmap(
+auto KeyValuePairLogEvent::get_auto_gen_keys_schema_subtree_bitmap(
 ) const -> OUTCOME_V2_NAMESPACE::std_result<std::vector<bool>> {
     return get_schema_subtree_bitmap(m_auto_gen_node_id_value_pairs, *m_auto_gen_keys_schema_tree);
 }
 
-auto KeyValuePairLogEvent::get_user_generated_schema_subtree_bitmap(
+auto KeyValuePairLogEvent::get_user_gen_keys_schema_subtree_bitmap(
 ) const -> outcome_v2::std_result<std::vector<bool>> {
     return get_schema_subtree_bitmap(m_user_gen_node_id_value_pairs, *m_user_gen_keys_schema_tree);
 }
 
 auto KeyValuePairLogEvent::serialize_to_json(
 ) const -> OUTCOME_V2_NAMESPACE::std_result<std::pair<nlohmann::json, nlohmann::json>> {
-    auto const auto_generated_schema_subtree_bitmap_result{get_auto_generated_schema_subtree_bitmap(
-    )};
-    if (auto_generated_schema_subtree_bitmap_result.has_error()) {
-        return auto_generated_schema_subtree_bitmap_result.error();
+    auto const auto_gen_keys_schema_subtree_bitmap_result{get_auto_gen_keys_schema_subtree_bitmap()
+    };
+    if (auto_gen_keys_schema_subtree_bitmap_result.has_error()) {
+        return auto_gen_keys_schema_subtree_bitmap_result.error();
     }
     auto serialized_auto_generated_kv_pairs_result{serialize_node_id_value_pairs_to_json(
             *m_auto_gen_keys_schema_tree,
             m_auto_gen_node_id_value_pairs,
-            auto_generated_schema_subtree_bitmap_result.value()
+            auto_gen_keys_schema_subtree_bitmap_result.value()
     )};
     if (serialized_auto_generated_kv_pairs_result.has_error()) {
         return serialized_auto_generated_kv_pairs_result.error();
     }
 
-    auto const user_generated_schema_subtree_bitmap_result{get_user_generated_schema_subtree_bitmap(
-    )};
-    if (user_generated_schema_subtree_bitmap_result.has_error()) {
-        return user_generated_schema_subtree_bitmap_result.error();
+    auto const user_gen_keys_schema_subtree_bitmap_result{get_user_gen_keys_schema_subtree_bitmap()
+    };
+    if (user_gen_keys_schema_subtree_bitmap_result.has_error()) {
+        return user_gen_keys_schema_subtree_bitmap_result.error();
     }
     auto serialized_user_generated_kv_pairs_result{serialize_node_id_value_pairs_to_json(
             *m_user_gen_keys_schema_tree,
             m_user_gen_node_id_value_pairs,
-            user_generated_schema_subtree_bitmap_result.value()
+            user_gen_keys_schema_subtree_bitmap_result.value()
     )};
     if (serialized_user_generated_kv_pairs_result.has_error()) {
         return serialized_user_generated_kv_pairs_result.error();
diff --git a/components/core/src/clp/ffi/KeyValuePairLogEvent.hpp b/components/core/src/clp/ffi/KeyValuePairLogEvent.hpp
index 187e85bc9..1620978bd 100644
--- a/components/core/src/clp/ffi/KeyValuePairLogEvent.hpp
+++ b/components/core/src/clp/ffi/KeyValuePairLogEvent.hpp
@@ -86,7 +86,7 @@ class KeyValuePairLogEvent {
      * - std::errc::result_out_of_range if a node ID in `m_auto_gen_node_id_value_pairs`
      *   doesn't exist in the schema tree.
      */
-    [[nodiscard]] auto get_auto_generated_schema_subtree_bitmap(
+    [[nodiscard]] auto get_auto_gen_keys_schema_subtree_bitmap(
     ) const -> OUTCOME_V2_NAMESPACE::std_result<std::vector<bool>>;
 
     /**
@@ -97,7 +97,7 @@ class KeyValuePairLogEvent {
      * - std::errc::result_out_of_range if a node ID in `m_user_gen_node_id_value_pairs`
      *   doesn't exist in the schema tree.
      */
-    [[nodiscard]] auto get_user_generated_schema_subtree_bitmap(
+    [[nodiscard]] auto get_user_gen_keys_schema_subtree_bitmap(
     ) const -> OUTCOME_V2_NAMESPACE::std_result<std::vector<bool>>;
 
     [[nodiscard]] auto get_utc_offset() const -> UtcOffset { return m_utc_offset; }
@@ -109,7 +109,7 @@ class KeyValuePairLogEvent {
      *   - Serialized auto-generated key-value pairs as a JSON object
      *   - Serialized user-generated key-value pairs as a JSON object
      * - The possible error codes:
-     *   - Forwards `get_auto_generated_schema_subtree_bitmap`'s return values on failure.
+     *   - Forwards `get_auto_gen_keys_schema_subtree_bitmap`'s return values on failure.
      *   - Forwards `serialize_node_id_value_pairs_to_json`'s return values on failure.
      */
     [[nodiscard]] auto serialize_to_json(