diff --git a/src/main/java/org/example/Operations/QueryOperations.java b/src/main/java/org/example/Operations/QueryOperations.java
index 7ed54c4..e5a7cdd 100644
--- a/src/main/java/org/example/Operations/QueryOperations.java
+++ b/src/main/java/org/example/Operations/QueryOperations.java
@@ -22,7 +22,7 @@ public QueryOperations(Wrapper client) {
         this.client = client;
         this.baseUrl = client.getBaseUrl() + "/query";
     }
-    public Response executeGenquery(String token, String query, QueryExecuteGenqueryParams params)  {
+    public Response executeGenQuery(String token, String query, QueryExecuteGenqueryParams params)  {
         Map<Object, Object> formData = new HashMap<>();
         formData.put("op", "execute_genquery");
 
diff --git a/src/test/java/org/example/Operations/CollectionOperationsTest.java b/src/test/java/org/example/Operations/CollectionOperationsTest.java
index 4f2cc53..36a389d 100644
--- a/src/test/java/org/example/Operations/CollectionOperationsTest.java
+++ b/src/test/java/org/example/Operations/CollectionOperationsTest.java
@@ -222,7 +222,7 @@ public void testModifyingMetadataAtomically() {
             // Add metadata to the collection.
             List<ModifyMetadataOperations> operation = new ArrayList<>();
             operation.add(new ModifyMetadataOperations("add", "a1", "v1", "u1"));
-            res = alice.collections().modify_metadata(aliceToken, collection, operation, OptionalInt.empty());
+            res = alice.collections().modifyMetadata(aliceToken, collection, operation, OptionalInt.empty());
             assertEquals("Adding metadata to collection request failed", 200, res.getHttpStatusCode());
             assertEquals("Adding metadata to collection failed", 0,
                     getIrodsResponseStatusCode(res.getBody()));
@@ -230,7 +230,7 @@ public void testModifyingMetadataAtomically() {
             // Show the metadata exists on the collection.
             String query = "select COLL_NAME where META_COLL_ATTR_NAME = 'a1' and META_COLL_ATTR_VALUE = 'v1' and " +
                     "META_COLL_ATTR_UNITS = 'u1'";
-            Response queryRes = alice.queryOperations().execute_genquery(aliceToken, query, null);
+            Response queryRes = alice.queryOperations().executeGenQuery(aliceToken, query, null);
             assertEquals("Executing genquery request failed", 200, queryRes.getHttpStatusCode());
             assertEquals("Executing genquery failed", 0,
                     getIrodsResponseStatusCode(queryRes.getBody()));
@@ -244,14 +244,14 @@ public void testModifyingMetadataAtomically() {
             // Remove the metadata from the collection.
             List<ModifyMetadataOperations> jsonParam2 = new ArrayList<>();
             jsonParam2.add(new ModifyMetadataOperations("remove", "a1", "v1", "u1"));
-            res = alice.collections().modify_metadata(aliceToken, collection, jsonParam2, OptionalInt.empty());
+            res = alice.collections().modifyMetadata(aliceToken, collection, jsonParam2, OptionalInt.empty());
             assertEquals("Removing metadata to collection request failed", 200, res.getHttpStatusCode());
             assertEquals("Removing metadata to collection failed", 0,
                     getIrodsResponseStatusCode(res.getBody()));
 
             // Show the metadata no longer exists on the collection.
             // Same query as before
-            Response queryRes2 = alice.queryOperations().execute_genquery(aliceToken, query, null);
+            Response queryRes2 = alice.queryOperations().executeGenQuery(aliceToken, query, null);
             assertEquals("Executing genquery request failed", 200, queryRes2.getHttpStatusCode());
             assertEquals("Executing genquery failed", 0,
                     getIrodsResponseStatusCode(queryRes2.getBody()));
@@ -263,7 +263,7 @@ public void testModifyingMetadataAtomically() {
             // Remove metadata
             List<ModifyMetadataOperations> jsonParam2 = new ArrayList<>();
             jsonParam2.add(new ModifyMetadataOperations("remove", "a1", "v1", "u1"));
-            alice.collections().modify_metadata(aliceToken, collection, jsonParam2, OptionalInt.empty());
+            alice.collections().modifyMetadata(aliceToken, collection, jsonParam2, OptionalInt.empty());
         }
     }
 
@@ -277,7 +277,7 @@ public void testModifyingPermissionsAtomically() {
             List<ModifyPermissionsOperations> operation = new ArrayList<>();
             operation.add(new ModifyPermissionsOperations("rods", "read"));
             res = assertDoesNotThrow(() ->
-                            alice.collections().modify_permissions(aliceToken, collection, operation, OptionalInt.empty()),
+                            alice.collections().modifyPermissions(aliceToken, collection, operation, OptionalInt.empty()),
                     "JsonProcessingException was thrown"
             );
 
@@ -317,7 +317,7 @@ public void testModifyingPermissionsAtomically() {
             List<ModifyPermissionsOperations> operation2 = new ArrayList<>();
             operation2.add(new ModifyPermissionsOperations("rods", "null"));
             res = assertDoesNotThrow(() ->
-                            alice.collections().modify_permissions(aliceToken, collection, operation2, OptionalInt.empty()),
+                            alice.collections().modifyPermissions(aliceToken, collection, operation2, OptionalInt.empty()),
                     "JsonProcessingException was thrown"
             );
 
@@ -340,7 +340,7 @@ public void testModifyingPermissionsAtomically() {
             List<ModifyPermissionsOperations> operation2 = new ArrayList<>();
             operation2.add(new ModifyPermissionsOperations("rods", "null"));
             res = assertDoesNotThrow(() ->
-                            alice.collections().modify_permissions(aliceToken, collection, operation2, OptionalInt.empty()),
+                            alice.collections().modifyPermissions(aliceToken, collection, operation2, OptionalInt.empty()),
                     "JsonProcessingException was thrown"
             );
         }
@@ -353,7 +353,7 @@ public void testTouchOperationUpdatesMtime() {
 
         // Get the mtime of the home collection.
         String query = "select COLL_MODIFY_TIME where COLL_NAME = '" + collection + "'";
-        Response queryRes = alice.queryOperations().execute_genquery(aliceToken, query, null);
+        Response queryRes = alice.queryOperations().executeGenQuery(aliceToken, query, null);
         assertEquals("Execute genquery request failed", 200, queryRes.getHttpStatusCode());
         assertEquals("Execute genquery failed", 0,
                 getIrodsResponseStatusCode(queryRes.getBody()));
@@ -377,7 +377,7 @@ public void testTouchOperationUpdatesMtime() {
 
         // Show the mtime has been updated.
         // Same query as before.
-        Response queryRes2 = alice.queryOperations().execute_genquery(aliceToken, query, null);
+        Response queryRes2 = alice.queryOperations().executeGenQuery(aliceToken, query, null);
         assertEquals("Execute genquery request failed", 200, queryRes2.getHttpStatusCode());
         assertEquals("Execute genquery failed", 0,
                 getIrodsResponseStatusCode(queryRes2.getBody()));
@@ -408,7 +408,7 @@ public void testEnablingAndDisablingInheritance() {
             assertFalse(inheritanceEnabled);
 
             // Enable inheritance.
-            res = alice.collections().set_inheritance(aliceToken, collection, 1, OptionalInt.empty());
+            res = alice.collections().setInheritance(aliceToken, collection, 1, OptionalInt.empty());
             assertEquals("Set inheritance request failed", 200, res.getHttpStatusCode());
             assertEquals("Set inheritance failed", 0,
                     getIrodsResponseStatusCode(res.getBody()));
@@ -424,7 +424,7 @@ public void testEnablingAndDisablingInheritance() {
             assertTrue(inheritanceEnabled);
 
             // Disable inheritance.
-            res = alice.collections().set_inheritance(aliceToken, collection, 0, OptionalInt.empty());
+            res = alice.collections().setInheritance(aliceToken, collection, 0, OptionalInt.empty());
             assertEquals("Set inheritance request failed", 200, res.getHttpStatusCode());
             assertEquals("Set inheritance failed", 0,
                     getIrodsResponseStatusCode(res.getBody()));
@@ -441,7 +441,7 @@ public void testEnablingAndDisablingInheritance() {
             assertFalse(inheritanceEnabled);
         } finally {
             // Disable inheritance
-            alice.collections().set_inheritance(aliceToken, collection, 0, OptionalInt.empty());
+            alice.collections().setInheritance(aliceToken, collection, 0, OptionalInt.empty());
         }
     }
 
diff --git a/src/test/java/org/example/Operations/DataObjectOperationsTest.java b/src/test/java/org/example/Operations/DataObjectOperationsTest.java
index 6547918..03940bd 100644
--- a/src/test/java/org/example/Operations/DataObjectOperationsTest.java
+++ b/src/test/java/org/example/Operations/DataObjectOperationsTest.java
@@ -382,7 +382,7 @@ public void test_registering_a_new_data_object() {
         // Show a new data object exists with the expected replica information.
         String query = "select COLL_NAME, DATA_NAME, DATA_PATH, RESC_NAME where COLL_NAME = " +
                 "'" + dir_name + "' and DATA_NAME = '" + filename + "'";
-        res = rods.queryOperations().executeGenquery(token, query, null);
+        res = rods.queryOperations().executeGenQuery(token, query, null);
         assertEquals("execute_genquery request failed", 200, res.getHttpStatusCode());
         assertEquals("execute_genquery failed", 0,
                 getIrodsResponseStatusCode(res.getBody()));
@@ -497,7 +497,7 @@ public void test_modifying_metadata_atomically() {
         // Show metadata exists on the data object.
         String query = "select COLL_NAME, DATA_NAME where META_DATA_ATTR_NAME = 'a1' and META_DATA_ATTR_VALUE = " +
                 "'v1' and META_DATA_ATTR_UNITS = 'u1'";
-        res = rods.queryOperations().executeGenquery(token, query, null);
+        res = rods.queryOperations().executeGenQuery(token, query, null);
         assertEquals("execute_genquery request failed", 200, res.getHttpStatusCode());
         assertEquals("execute_genquery failed", 0,
                 getIrodsResponseStatusCode(res.getBody()));
@@ -526,7 +526,7 @@ public void test_modifying_metadata_atomically() {
 
         // Show the metadata no longer exists on the data object.
         query = "select COLL_NAME, DATA_NAME where META_DATA_ATTR_NAME = 'a1' and META_DATA_ATTR_VALUE = 'v1' and META_DATA_ATTR_UNITS = 'u1'";
-        res = rods.queryOperations().executeGenquery(token, query, null);
+        res = rods.queryOperations().executeGenQuery(token, query, null);
         assertEquals("execute_genquery request failed", 200, res.getHttpStatusCode());
         assertEquals("execute_genquery failed", 0,
                 getIrodsResponseStatusCode(res.getBody()));
@@ -607,7 +607,7 @@ public void test_modifying_replica_properties() {
                 "select DATA_REPL_STATUS, DATA_SIZE where COLL_NAME = '%s' and DATA_NAME = '%s'",
                 directoryName, fileName
         );
-        res = rods.queryOperations().executeGenquery(token, query, null);
+        res = rods.queryOperations().executeGenQuery(token, query, null);
         assertEquals("execute_genquery request failed", 200, res.getHttpStatusCode());
         assertEquals("execute_genquery failed", 0,
                 getIrodsResponseStatusCode(res.getBody()));
@@ -635,7 +635,7 @@ public void test_modifying_replica_properties() {
 
         // Show the replica's status and size has changed in the catalog.
         // Same query as before
-        res = rods.queryOperations().executeGenquery(token, query, null);
+        res = rods.queryOperations().executeGenQuery(token, query, null);
         assertEquals("execute_genquery request failed", 200, res.getHttpStatusCode());
         assertEquals("execute_genquery failed", 0,
                 getIrodsResponseStatusCode(res.getBody()));