diff --git a/ClientApiNotes.md b/ClientApiNotes.md
index 5b1aa97..a080c6b 100644
--- a/ClientApiNotes.md
+++ b/ClientApiNotes.md
@@ -19,11 +19,11 @@ Use cases to consider:
 Considering the above issues and uses cases, my current thinking is as follows:
 
 * Store metadata in the same database as data
-* Allow arbitrary key/value pairs to be associated with each message and each channel
+* Allow arbitrary key/value pairs to be associated with each message and group
 * Initially, support the following queries:
   * Get the IDs of all messages with a given metadata key
   * Ditto, also retrieving the metadata value
-  * Queries can be scoped to a single channel or all the client's channels
+  * Queries can be scoped to a single group or all the client's groups
 * The sync layer needs to know about dependencies between messages
   * References between messages are encoded in the message body rather than the header
   * References belong in the body because signatures etc may need to cover them