diff --git a/amnet-native/models/AM-API.ts b/amnet-native/models/AM-API.ts
index 0faaf84..196fb04 100644
--- a/amnet-native/models/AM-API.ts
+++ b/amnet-native/models/AM-API.ts
@@ -1,10 +1,10 @@
 export interface AMServerInfoResponse {
-    server_name: string;
-    api_version: number;
+    serverName: string;
+    apiVersion: number;
 }
 
 export interface AMCardInRequest {
-    card_id: string;
+    cardId: string;
 }
 
 export function generateCardNumber(): string {
diff --git a/amnet-native/models/AMServer.ts b/amnet-native/models/AMServer.ts
index 05bf399..23fd56f 100644
--- a/amnet-native/models/AMServer.ts
+++ b/amnet-native/models/AMServer.ts
@@ -4,22 +4,22 @@ import {AMServerInfoResponse} from "./AM-API";
 export class AMServer extends Realm.Object<AMServer> implements AMServerInfoResponse {
     _id!: Realm.BSON.ObjectId;
 
-    server_name: string;
-    server_address: string;
+    serverName: string;
+    serverAddress: string;
 
-    last_used: Date;
-    created_at: Date;
-    api_version: number;
+    lastUsed: Date;
+    createdAt: Date;
+    apiVersion: number;
 
     async connect(abort?: AbortSignal | undefined): Promise<boolean> {
         try {
-            const response = await fetch(this.server_address, {
+            const response = await fetch(this.serverAddress, {
                 signal: abort
             });
 
             const data: AMServerInfoResponse = await response.json();
 
-            this.last_used = new Date();
+            this.lastUsed = new Date();
             Object.apply(this, data);
 
             return true;
@@ -30,7 +30,7 @@ export class AMServer extends Realm.Object<AMServer> implements AMServerInfoResp
 
     async submitCard(cardId: string, abort?: AbortSignal | undefined): Promise<boolean> {
         try {
-            const response = await fetch(`${this.server_address}/card`, {
+            const response = await fetch(`${this.serverAddress}/card`, {
                 method: "POST",
                 headers: {
                     "Content-Type": "application/json"
@@ -46,6 +46,17 @@ export class AMServer extends Realm.Object<AMServer> implements AMServerInfoResp
             return false;
         }
     }
+    
+    static generate(serverAddress: string) {
+        return {
+            _id: new Realm.BSON.ObjectId(),
+            serverAddress,
+            createdAt: new Date(),
+            serverName: "New Server",
+            lastUsed: null,
+            apiVersion: 0
+        }
+    }
 
     static schema: Realm.ObjectSchema = {
         name: "server",
@@ -53,11 +64,11 @@ export class AMServer extends Realm.Object<AMServer> implements AMServerInfoResp
 
         properties: {
             _id: "objectId",
-            server_address: "string",
-            server_name: {type: "string", default: "New Server"},
-            last_used: {type: "date", optional: true},
-            created_at: {type: "date", default: new Date()},
-            api_version: {type: "int", default: 0}
+            serverAddress: "string",
+            serverName: {type: "string", default: "New Server"},
+            lastUsed: {type: "date", optional: true},
+            createdAt: {type: "date", default: new Date()},
+            apiVersion: {type: "int", default: 0}
         }
     };
 }
\ No newline at end of file