diff --git a/server.js b/server.js
index f9d9bc4..744194a 100644
--- a/server.js
+++ b/server.js
@@ -81,7 +81,7 @@ async function main() {
     // Create and start the Source server
     const musicServer = new MusicServer(
       {
-        source_id: generateUniqueId("server"),
+        server_id: generateUniqueId("server"),
         name: "SDKSample",
       },
       logger,
diff --git a/src/client/client.ts b/src/client/client.ts
index 73b9113..54ac19f 100644
--- a/src/client/client.ts
+++ b/src/client/client.ts
@@ -168,7 +168,7 @@ export class Client extends EventEmitter<Events> {
   private _handleTextMessage(message: ServerMessages, receivedAt: number) {
     this.logger.log("Received text message:", message);
     switch (message.type) {
-      case "source/hello":
+      case "server/hello":
         this.logger.log("Server connected:", this.serverInfo);
         this.serverInfo = message.payload;
         this.fire("server-update", this.serverInfo);
@@ -197,7 +197,7 @@ export class Client extends EventEmitter<Events> {
         this.fire("metadata-update", this.metadata);
         break;
 
-      case "source/time":
+      case "server/time":
         this._handleServerTime(message.payload, receivedAt);
         break;
 
@@ -387,13 +387,13 @@ export class Client extends EventEmitter<Events> {
   }
 
   private _handleServerTime(payload: ServerTimeInfo, receivedAt: number) {
-    const { player_transmitted, source_received, source_transmitted } = payload;
+    const { player_transmitted, server_received, server_transmitted } = payload;
 
     // Calculate the raw offset from this message (in seconds)
     const offset =
-      (source_received -
+      (server_received -
         player_transmitted +
-        (source_transmitted - receivedAt)) /
+        (server_transmitted - receivedAt)) /
       2 /
       1000000;
 
diff --git a/src/messages.ts b/src/messages.ts
index 3f0e264..da26176 100644
--- a/src/messages.ts
+++ b/src/messages.ts
@@ -28,8 +28,8 @@ export interface PlayerTimeInfo {
 
 export interface ServerTimeInfo {
   player_transmitted: number;
-  source_received: number;
-  source_transmitted: number;
+  server_received: number;
+  server_transmitted: number;
 }
 
 export interface PlayerTimeMessage {
@@ -38,17 +38,17 @@ export interface PlayerTimeMessage {
 }
 
 export interface ServerInfo {
-  source_id: string;
+  server_id: string;
   name: string;
 }
 
 export interface ServerHelloMessage {
-  type: "source/hello";
+  type: "server/hello";
   payload: ServerInfo;
 }
 
 export interface ServerTimeMessage {
-  type: "source/time";
+  type: "server/time";
   payload: ServerTimeInfo;
 }
 
diff --git a/src/server/server-client.ts b/src/server/server-client.ts
index 93811c1..996270e 100644
--- a/src/server/server-client.ts
+++ b/src/server/server-client.ts
@@ -111,13 +111,13 @@ export class ServerClient extends EventEmitter<ServerClientEvents> {
         break;
       case "player/time":
         this.send({
-          type: "source/time" as const,
+          type: "server/time" as const,
           payload: {
             player_transmitted: message.payload.player_transmitted,
-            source_received: Math.round(
+            server_received: Math.round(
               (performance.timeOrigin + performance.now()) * 1000,
             ),
-            source_transmitted: Math.round(
+            server_transmitted: Math.round(
               (performance.timeOrigin + performance.now()) * 1000,
             ),
           },
@@ -135,7 +135,7 @@ export class ServerClient extends EventEmitter<ServerClientEvents> {
   public async accept(serverInfo: ServerInfo) {
     await new Promise((resolve) => {
       this.send({
-        type: "source/hello" as const,
+        type: "server/hello" as const,
         payload: serverInfo,
       });
       if (this.playerInfo) {