diff --git a/lib/src/model/access_token_response.dart b/lib/src/model/access_token_response.dart
index 71b2bd7..4626475 100644
--- a/lib/src/model/access_token_response.dart
+++ b/lib/src/model/access_token_response.dart
@@ -8,6 +8,7 @@ part 'access_token_response.g.dart';
 /// * [accessToken]
 @JsonSerializable()
 class AccessTokenResponse {
+  @JsonKey(name: 'access_token')
   final String accessToken;
 
   const AccessTokenResponse({required this.accessToken});
diff --git a/lib/src/model/access_token_response.g.dart b/lib/src/model/access_token_response.g.dart
index e90cccc..52343a2 100644
--- a/lib/src/model/access_token_response.g.dart
+++ b/lib/src/model/access_token_response.g.dart
@@ -8,11 +8,11 @@ part of 'access_token_response.dart';
 
 AccessTokenResponse _$AccessTokenResponseFromJson(Map<String, dynamic> json) =>
     AccessTokenResponse(
-      accessToken: json['accessToken'] as String,
+      accessToken: json['access_token'] as String,
     );
 
 Map<String, dynamic> _$AccessTokenResponseToJson(
         AccessTokenResponse instance) =>
     <String, dynamic>{
-      'accessToken': instance.accessToken,
+      'access_token': instance.accessToken,
     };
diff --git a/lib/src/model/column_condition_compat.dart b/lib/src/model/column_condition_compat.dart
index 8158c19..0136fbf 100644
--- a/lib/src/model/column_condition_compat.dart
+++ b/lib/src/model/column_condition_compat.dart
@@ -26,6 +26,7 @@ enum ColumnConditionCompatOperator {
 @JsonSerializable()
 class ColumnConditionCompat {
   final String column;
+  @JsonKey(name: 'operator')
   final ColumnConditionCompatOperator operator_;
   final dynamic value;
 
diff --git a/lib/src/model/column_condition_compat.g.dart b/lib/src/model/column_condition_compat.g.dart
index d3d4d1e..4b44fa1 100644
--- a/lib/src/model/column_condition_compat.g.dart
+++ b/lib/src/model/column_condition_compat.g.dart
@@ -10,8 +10,8 @@ ColumnConditionCompat _$ColumnConditionCompatFromJson(
         Map<String, dynamic> json) =>
     ColumnConditionCompat(
       column: json['column'] as String,
-      operator_: $enumDecode(
-          _$ColumnConditionCompatOperatorEnumMap, json['operator_']),
+      operator_:
+          $enumDecode(_$ColumnConditionCompatOperatorEnumMap, json['operator']),
       value: json['value'],
     );
 
@@ -19,7 +19,7 @@ Map<String, dynamic> _$ColumnConditionCompatToJson(
         ColumnConditionCompat instance) =>
     <String, dynamic>{
       'column': instance.column,
-      'operator_': _$ColumnConditionCompatOperatorEnumMap[instance.operator_]!,
+      'operator': _$ColumnConditionCompatOperatorEnumMap[instance.operator_]!,
       'value': instance.value,
     };
 
diff --git a/lib/src/model/table_definition.dart b/lib/src/model/table_definition.dart
index c4931c3..245b579 100644
--- a/lib/src/model/table_definition.dart
+++ b/lib/src/model/table_definition.dart
@@ -12,7 +12,9 @@ part 'table_definition.g.dart';
 /// * [hidden]
 @JsonSerializable()
 class TableDefinition {
+  @JsonKey(name: 'table_id')
   final String tableId;
+  @JsonKey(name: 'table_name')
   final String tableName;
   final String columns;
   final bool system;
diff --git a/lib/src/model/table_definition.g.dart b/lib/src/model/table_definition.g.dart
index da4cca9..8cfcdd5 100644
--- a/lib/src/model/table_definition.g.dart
+++ b/lib/src/model/table_definition.g.dart
@@ -8,8 +8,8 @@ part of 'table_definition.dart';
 
 TableDefinition _$TableDefinitionFromJson(Map<String, dynamic> json) =>
     TableDefinition(
-      tableId: json['tableId'] as String,
-      tableName: json['tableName'] as String,
+      tableId: json['table_id'] as String,
+      tableName: json['table_name'] as String,
       columns: json['columns'] as String,
       system: json['system'] as bool,
       hidden: json['hidden'] as bool,
@@ -17,8 +17,8 @@ TableDefinition _$TableDefinitionFromJson(Map<String, dynamic> json) =>
 
 Map<String, dynamic> _$TableDefinitionToJson(TableDefinition instance) =>
     <String, dynamic>{
-      'tableId': instance.tableId,
-      'tableName': instance.tableName,
+      'table_id': instance.tableId,
+      'table_name': instance.tableName,
       'columns': instance.columns,
       'system': instance.system,
       'hidden': instance.hidden,
diff --git a/lib/src/model/user_update_definition.dart b/lib/src/model/user_update_definition.dart
index 7330919..7ffd59e 100644
--- a/lib/src/model/user_update_definition.dart
+++ b/lib/src/model/user_update_definition.dart
@@ -10,8 +10,10 @@ part 'user_update_definition.g.dart';
 /// * [accessToken]
 @JsonSerializable()
 class UserUpdateDefinition {
+  @JsonKey(name: 'user_id')
   final int userId;
   final String password;
+  @JsonKey(name: 'access_token')
   final String accessToken;
 
   const UserUpdateDefinition({
diff --git a/lib/src/model/user_update_definition.g.dart b/lib/src/model/user_update_definition.g.dart
index f5ec5fb..5c9f4ca 100644
--- a/lib/src/model/user_update_definition.g.dart
+++ b/lib/src/model/user_update_definition.g.dart
@@ -9,15 +9,15 @@ part of 'user_update_definition.dart';
 UserUpdateDefinition _$UserUpdateDefinitionFromJson(
         Map<String, dynamic> json) =>
     UserUpdateDefinition(
-      userId: json['userId'] as int,
+      userId: json['user_id'] as int,
       password: json['password'] as String,
-      accessToken: json['accessToken'] as String,
+      accessToken: json['access_token'] as String,
     );
 
 Map<String, dynamic> _$UserUpdateDefinitionToJson(
         UserUpdateDefinition instance) =>
     <String, dynamic>{
-      'userId': instance.userId,
+      'user_id': instance.userId,
       'password': instance.password,
-      'accessToken': instance.accessToken,
+      'access_token': instance.accessToken,
     };