diff --git a/components/core/src/clp/ffi/KeyValuePairLogEvent.cpp b/components/core/src/clp/ffi/KeyValuePairLogEvent.cpp
index e55860aba..8e8bb15f5 100644
--- a/components/core/src/clp/ffi/KeyValuePairLogEvent.cpp
+++ b/components/core/src/clp/ffi/KeyValuePairLogEvent.cpp
@@ -577,13 +577,13 @@ auto KeyValuePairLogEvent::serialize_to_json(
     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(
+    auto serialized_auto_gen_kv_pairs_result{serialize_node_id_value_pairs_to_json(
             *m_auto_gen_keys_schema_tree,
             m_auto_gen_node_id_value_pairs,
             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();
+    if (serialized_auto_gen_kv_pairs_result.has_error()) {
+        return serialized_auto_gen_kv_pairs_result.error();
     }
 
     auto const user_gen_keys_schema_subtree_bitmap_result{get_user_gen_keys_schema_subtree_bitmap()
@@ -591,16 +591,16 @@ auto KeyValuePairLogEvent::serialize_to_json(
     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(
+    auto serialized_user_gen_kv_pairs_result{serialize_node_id_value_pairs_to_json(
             *m_user_gen_keys_schema_tree,
             m_user_gen_node_id_value_pairs,
             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();
+    if (serialized_user_gen_kv_pairs_result.has_error()) {
+        return serialized_user_gen_kv_pairs_result.error();
     }
 
-    return {std::move(serialized_auto_generated_kv_pairs_result.value()),
-            std::move(serialized_user_generated_kv_pairs_result.value())};
+    return {std::move(serialized_auto_gen_kv_pairs_result.value()),
+            std::move(serialized_user_gen_kv_pairs_result.value())};
 }
 }  // namespace clp::ffi