diff --git a/server/src/handlers/graph.rs b/server/src/handlers/graph.rs
index 68ae6df..5d2731e 100644
--- a/server/src/handlers/graph.rs
+++ b/server/src/handlers/graph.rs
@@ -631,7 +631,7 @@ mod tests {
         let create_handler = CreateEntitiesHandler;
         let args = json!({
             "entities": [
-                {"name": "Alice", "entityType": "Person", "observations": ["Likes Bob"]}
+                {"name": "Alice", "entity_type": "Person", "observations": ["Likes Bob"]}
             ]
         });
 
@@ -677,7 +677,7 @@ mod tests {
         let handler = CreateRelationsHandler;
         let args = json!({
             "relations": [
-                {"from": "A", "to": "B", "relationType": "knows"}
+                {"from": "A", "to": "B", "relation_type": "knows"}
             ]
         });
         let res = handler.execute(args, state.clone()).await.unwrap();
@@ -706,7 +706,7 @@ mod tests {
         let add_obs = AddObservationsHandler;
         let args_obs = json!({
             "observations": [
-                {"entityName": "A", "contents": ["Obs 1", "Obs 2"]}
+                {"entity_name": "A", "contents": ["Obs 1", "Obs 2"]}
             ]
         });
         let res1 = add_obs.execute(args_obs, state.clone()).await.unwrap();
@@ -722,7 +722,7 @@ mod tests {
 
         let del_entity = DeleteEntitiesHandler;
         let res4 = del_entity
-            .execute(json!({"entityNames": ["A"]}), state.clone())
+            .execute(json!({"entity_names": ["A"]}), state.clone())
             .await
             .unwrap();
         assert_eq!(res4, "Entities deleted");
@@ -742,8 +742,8 @@ mod tests {
         let create_handler = CreateEntitiesHandler;
         let args_ent = json!({
             "entities": [
-                {"name": "X", "entityType": "File", "observations": ["Obs X"], "namespace": "global"},
-                {"name": "Y", "entityType": "File", "observations": ["Obs Y"], "namespace": "global"}
+                {"name": "X", "entity_type": "File", "observations": ["Obs X"], "namespace": "global"},
+                {"name": "Y", "entity_type": "File", "observations": ["Obs Y"], "namespace": "global"}
             ]
         });
         create_handler
@@ -754,7 +754,7 @@ mod tests {
         let rel_handler = CreateRelationsHandler;
         let args_rel = json!({
             "relations": [
-                {"from": "X", "to": "Y", "relationType": "depends_on", "namespace": "global"}
+                {"from": "X", "to": "Y", "relation_type": "depends_on", "namespace": "global"}
             ]
         });
         rel_handler.execute(args_rel, state.clone()).await.unwrap();
@@ -784,7 +784,7 @@ mod tests {
         let condense = CondenseEntityHandler;
         let res_cond = condense
             .execute(
-                json!({"entityName": "X", "summarized_observations": ["X condensed"]}),
+                json!({"entity_name": "X", "summarized_observations": ["X condensed"]}),
                 state.clone(),
             )
             .await
@@ -794,7 +794,7 @@ mod tests {
         let merge = MergeEntitiesHandler;
         let res_merge = merge
             .execute(
-                json!({"sourceEntity": "X", "targetEntity": "Y"}),
+                json!({"source_entity": "X", "target_entity": "Y"}),
                 state.clone(),
             )
             .await
diff --git a/server/src/handlers/meta.rs b/server/src/handlers/meta.rs
index f10a256..1e2e7ce 100644
--- a/server/src/handlers/meta.rs
+++ b/server/src/handlers/meta.rs
@@ -609,7 +609,7 @@ mod tests {
 
         let code_handler = LogCodeChangeHandler;
         let args_code = json!({
-            "filePath": "main.rs",
+            "file_path": "main.rs",
             "description": "refactor",
             "git_commit": "def",
             "git_branch": "main"