diff --git a/test/AWS_Tests/src/Enso_Cloud_Spec.enso b/test/AWS_Tests/src/Enso_Cloud_Spec.enso
index 9339060513709..8ae67b3b76e9f 100644
--- a/test/AWS_Tests/src/Enso_Cloud_Spec.enso
+++ b/test/AWS_Tests/src/Enso_Cloud_Spec.enso
@@ -60,8 +60,8 @@ spec =
                         "id": "organization-27xJM00p8jWoL2qByTo6tQfciWC",
                         "name": "Parsed user",
                         "email": "enso-parse-test@example.com",
-                        "is_enabled": true,
-                        "root_directory_id": "directory-27xJM00p8jWoL2qByTo6tQfciWC"
+                        "isEnabled": true,
+                        "rootDirectoryId": "directory-27xJM00p8jWoL2qByTo6tQfciWC"
                     }
                 parsed_user = Enso_User.from json
                 parsed_user.id.should_equal "organization-27xJM00p8jWoL2qByTo6tQfciWC"
diff --git a/tools/simple-httpbin/src/main/java/org/enso/shttp/cloud_mock/UsersHandler.java b/tools/simple-httpbin/src/main/java/org/enso/shttp/cloud_mock/UsersHandler.java
index 8df50a7baa5c9..d80cec0cf20de 100644
--- a/tools/simple-httpbin/src/main/java/org/enso/shttp/cloud_mock/UsersHandler.java
+++ b/tools/simple-httpbin/src/main/java/org/enso/shttp/cloud_mock/UsersHandler.java
@@ -46,8 +46,8 @@ private void sendUserList(CloudExchange exchange) throws IOException {
           "id": "organization-27xJM00p8jWoL2qByTo6tQfciWC",
           "name": "My test User 1",
           "email": "enso-test-user-1@example.com",
-          "is_enabled": true,
-          "root_directory_id": "directory-27xJM00p8jWoL2qByTo6tQfciWC"
+          "isEnabled": true,
+          "rootDirectoryId": "directory-27xJM00p8jWoL2qByTo6tQfciWC"
       }
       """;
 
@@ -56,8 +56,8 @@ private void sendUserList(CloudExchange exchange) throws IOException {
           "id": "organization-44AAA00A8AAAA2AAAAA6AAAAAAA",
           "name": "My test User 2",
           "email": "enso-test-user-2@example.com",
-          "is_enabled": false,
-          "root_directory_id": "directory-44AAA00A8AAAA2AAAAA6AAAAAAA"
+          "isEnabled": false,
+          "rootDirectoryId": "directory-44AAA00A8AAAA2AAAAA6AAAAAAA"
       }
       """;
 }