diff --git a/bindings/cmix.go b/bindings/cmix.go
index d925b4bb75bdacc0c3ddd985bfd924993ff78606..4b9d66cf31598178e56e387d429b390cb91356c4 100644
--- a/bindings/cmix.go
+++ b/bindings/cmix.go
@@ -35,7 +35,7 @@ type Cmix struct {
 	id  int
 }
 
-// NewCmix creates client storage, generates keys, connects, and registers
+// NewCmix creates user storage, generates keys, connects, and registers
 // with the network. Note that this does not register a username/identity, but
 // merely creates a new cryptographic identity for adding such information
 // at a later date.
@@ -49,8 +49,8 @@ func NewCmix(ndfJSON, storageDir string, password []byte, registrationCode strin
 	return nil
 }
 
-// LoadCmix will load an existing client from the storageDir using the password.
-// This will fail if the client does not exist or the password is incorrect.
+// LoadCmix will load an existing user storage from the storageDir using the password.
+// This will fail if the user storage does not exist or the password is incorrect.
 //
 // The password is passed as a byte array so that it can be cleared from memory
 // and stored as securely as possible using the MemGuard library.
diff --git a/bindings/fileTransfer.go b/bindings/fileTransfer.go
index ec59deff6f4d6c294d61df1d14452404a0d3b50b..5c51b36dd8a183ea06c348731b183d31f74a5375 100644
--- a/bindings/fileTransfer.go
+++ b/bindings/fileTransfer.go
@@ -133,7 +133,7 @@ func InitFileTransfer(e2eID int, receiveFileCallback ReceiveFileCallback, e2eFil
 		return nil, err
 	}
 
-	// Client info
+	// User info
 	myID := user.api.GetReceptionIdentity().ID
 	rng := user.api.GetRng()
 
@@ -168,7 +168,7 @@ func InitFileTransfer(e2eID int, receiveFileCallback ReceiveFileCallback, e2eFil
 		return nil, err
 	}
 
-	// Add file transfer processes to client services tracking
+	// Add file transfer processes to API services tracking
 	err = user.api.AddService(m.StartProcesses)
 	if err != nil {
 		return nil, err
diff --git a/bindings/follow.go b/bindings/follow.go
index d90dfc8001492c1c02c9870bb3985065d9d0b599..8e5826dc9ddc85956e313530f0b3baf7df4bf7eb 100644
--- a/bindings/follow.go
+++ b/bindings/follow.go
@@ -16,7 +16,7 @@ import (
 )
 
 // StartNetworkFollower kicks off the tracking of the network. It starts long-
-// running network client threads and returns an object for checking state and
+// running network threads and returns an object for checking state and
 // stopping those threads.
 //
 // Call this when returning from sleep and close when going back to sleep.
@@ -57,7 +57,7 @@ func (c *Cmix) StartNetworkFollower(timeoutMS int) error {
 // an error if the follower is in the wrong state to stop or if it fails to stop
 // it.
 //
-// if the network follower is running and this fails, the client object will
+// if the network follower is running and this fails, the Cmix object will
 // most likely be in an unrecoverable state and need to be trashed.
 func (c *Cmix) StopNetworkFollower() error {
 	if err := c.api.StopNetworkFollower(); err != nil {
diff --git a/ud/manager.go b/ud/manager.go
index eac707be329b455d3f5ba89f2dd9f84206b55786..6c5817abcd05d9c27f935a1847539bc067339b34 100644
--- a/ud/manager.go
+++ b/ud/manager.go
@@ -143,7 +143,7 @@ func NewManagerFromBackup(user udE2e, comms Comms, follower udNetworkStatus,
 	}
 
 	// Set as registered. Since it's from a backup,
-	// the client is already registered
+	// the user is already registered
 	if err = setRegistered(m.getKv()); err != nil {
 		return nil, errors.WithMessage(err, "failed to set client as "+
 			"registered with user discovery.")
@@ -176,7 +176,7 @@ func InitStoreFromBackup(kv *versioned.KV,
 	}
 
 	// Set as registered. Since it's from a backup,
-	// the client is already registered
+	// the user is already registered
 	if err = setRegistered(kv); err != nil {
 		return errors.WithMessage(err, "failed to set client as "+
 			"registered with user discovery.")
diff --git a/ud/registered.go b/ud/registered.go
index 41eb6ccd3ec04c3046462048232dafceb93a3412..06dba95886e3d92717ae9d8143fbd3ca8bd3189c 100644
--- a/ud/registered.go
+++ b/ud/registered.go
@@ -11,7 +11,7 @@ import (
 const isRegisteredKey = "isRegisteredKey"
 const isRegisteredVersion = 0
 
-// isRegistered loads from storage if the client is registered with user
+// isRegistered loads from storage if the user is registered with user
 // discovery.
 func (m *Manager) isRegistered() bool {
 	_, err := m.getKv().Get(isRegisteredKey, isRegisteredVersion)