3 files changed, 24 insertions, 24 deletions

diff --git a/ui/lib/state/remote/channels.svelte.js b/ui/lib/state/remote/conversations.svelte.js
index 1e40075..79868f4 100644
--- a/ui/lib/state/remote/channels.svelte.js
+++ b/ui/lib/state/remote/conversations.svelte.js
@@ -1,8 +1,8 @@
 import { DateTime } from 'luxon';
 
-class Channel {
+class Conversation {
   static boot({ at, id, name }) {
-    return new Channel({
+    return new Conversation({
       at: DateTime.fromISO(at),
       id,
       name,
@@ -16,14 +16,14 @@ class Channel {
   }
 }
 
-export class Channels {
+export class Conversations {
   all = $state([]);
 
   add({ at, id, name }) {
-    this.all.push(Channel.boot({ at, id, name }));
+    this.all.push(Conversation.boot({ at, id, name }));
   }
 
   remove(id) {
-    this.all = this.all.filter((channel) => channel.id !== id);
+    this.all = this.all.filter((conversation) => conversation.id !== id);
   }
 }
diff --git a/ui/lib/state/remote/messages.svelte.js b/ui/lib/state/remote/messages.svelte.js
index 1be001b..852f29e 100644
--- a/ui/lib/state/remote/messages.svelte.js
+++ b/ui/lib/state/remote/messages.svelte.js
@@ -2,21 +2,21 @@ import { DateTime } from 'luxon';
 import { render } from '$lib/markdown.js';
 
 class Message {
-  static boot({ id, at, channel, sender, body }) {
+  static boot({ id, at, conversation, sender, body }) {
     return new Message({
       id,
       at: DateTime.fromISO(at),
-      channel,
+      conversation,
       sender,
       body,
       renderedBody: render(body),
     });
   }
 
-  constructor({ id, at, channel, sender, body, renderedBody }) {
+  constructor({ id, at, conversation, sender, body, renderedBody }) {
     this.id = id;
     this.at = at;
-    this.channel = channel;
+    this.conversation = conversation;
     this.sender = sender;
     this.body = body;
     this.renderedBody = renderedBody;
@@ -26,8 +26,8 @@ class Message {
 export class Messages {
   all = $state([]);
 
-  add({ id, at, channel, sender, body }) {
-    const message = Message.boot({ id, at, channel, sender, body });
+  add({ id, at, conversation, sender, body }) {
+    const message = Message.boot({ id, at, conversation, sender, body });
     this.all.push(message);
   }
 
diff --git a/ui/lib/state/remote/state.svelte.js b/ui/lib/state/remote/state.svelte.js
index fb46489..3d65e4a 100644
--- a/ui/lib/state/remote/state.svelte.js
+++ b/ui/lib/state/remote/state.svelte.js
@@ -1,11 +1,11 @@
 import { User, Users } from './users.svelte.js';
-import { Channels } from './channels.svelte.js';
+import { Conversations } from './conversations.svelte.js';
 import { Messages } from './messages.svelte.js';
 
 export class State {
   currentUser = $state();
   users = $state(new Users());
-  channels = $state(new Channels());
+  conversations = $state(new Conversations());
   messages = $state(new Messages());
 
   static boot({ currentUser, heartbeat, resumePoint, events }) {
@@ -30,8 +30,8 @@ export class State {
     // Heartbeats are actually completely ignored here. They're handled in `Session`, but not as a
     // special case; _any_ event is a heartbeat event.
     switch (event.type) {
-      case 'channel':
-        return this.onChannelEvent(event);
+      case 'conversation':
+        return this.onConversationEvent(event);
       case 'user':
         return this.onUserEvent(event);
       case 'message':
@@ -39,23 +39,23 @@ export class State {
     }
   }
 
-  onChannelEvent(event) {
+  onConversationEvent(event) {
     switch (event.event) {
       case 'created':
-        return this.onChannelCreated(event);
+        return this.onConversationCreated(event);
       case 'deleted':
-        return this.onChannelDeleted(event);
+        return this.onConversationDeleted(event);
     }
   }
 
-  onChannelCreated(event) {
+  onConversationCreated(event) {
     const { id, name } = event;
-    this.channels.add({ id, name });
+    this.conversations.add({ id, name });
   }
 
-  onChannelDeleted(event) {
+  onConversationDeleted(event) {
     const { id } = event;
-    this.channels.remove(id);
+    this.conversations.remove(id);
   }
 
   onUserEvent(event) {
@@ -80,8 +80,8 @@ export class State {
   }
 
   onMessageSent(event) {
-    const { id, at, channel, sender, body } = event;
-    this.messages.add({ id, at, channel, sender, body });
+    const { id, at, conversation, sender, body } = event;
+    this.messages.add({ id, at, conversation, sender, body });
   }
 
   onMessageDeleted(event) {