diff --git a/src/client.ts b/src/client.ts
index 3d076a4..5ad0a3e 100644
--- a/src/client.ts
+++ b/src/client.ts
@@ -103,7 +103,7 @@ export class TribufuClient extends TribufuApi {
      * @param tokens
      */
     private setTokensFromResponse(tokens: OAuth2TokenResponse): void {
-        this.setTokens(tokens.access_token, tokens.refresh_token || null, tokens.expires_in || null);
+        this.setTokens(tokens.accessToken, tokens.refreshToken || null, tokens.expiresIn || null);
     }
 
     /**
@@ -245,7 +245,7 @@ export class TribufuClient extends TribufuApi {
 
         const requestBody: OAuth2IntrospectionRequest = {
             token: this.options.accessToken,
-            token_type_hint: "access_token",
+            tokenTypeHint: "access_token",
         }
 
         const url = `/v1/oauth2/introspect`;
@@ -270,7 +270,7 @@ export class TribufuClient extends TribufuApi {
 
         const requestBody: OAuth2IntrospectionRequest = {
             token: this.options.refreshToken,
-            token_type_hint: "refresh_token",
+            tokenTypeHint: "refresh_token",
         }
 
         const url = `/v1/oauth2/revoke`;
@@ -310,14 +310,14 @@ export class TribufuClient extends TribufuApi {
      */
     protected async getToken(grantType: OAuth2GrantType, grantValue: string | null, subjectKey: string | null, subjectValue: string | null): Promise<OAuth2TokenResponse | null> {
         const requestBody: OAuth2TokenRequest = {
-            grant_type: grantType,
+            grantType: grantType,
             code: grantType === "authorization_code" ? grantValue : null,
-            refresh_token: grantType === "refresh_token" ? grantValue : null,
+            refreshToken: grantType === "refresh_token" ? grantValue : null,
             username: grantType === "password" || grantType === "passkey" ? subjectValue : null,
             password: grantType === "password" ? grantValue : null,
             passkey: grantType === "passkey" ? grantValue : null,
-            client_id: this.clientId,
-            client_secret: this.clientSecret,
+            clientId: this.clientId,
+            clientSecret: this.clientSecret,
         }
 
         const params = subjectKey && subjectValue ? `?${subjectKey}=${subjectValue}` : "";