diff --git a/xs/mintty_wrapper.sh b/xs/mintty_wrapper.sh
index 9cba8ff..dbc678a 100755
--- a/xs/mintty_wrapper.sh
+++ b/xs/mintty_wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 ## This wrapper may be used within the MSYS/mintty Windows
-## shell environment to have a functioning hkexsh client with
+## shell environment to have a functioning xs client with
 ## working 'raw' mode and hidden password entry.
 ##
 ## mintty uses named pipes and ptys to get a more POSIX-like
diff --git a/xsnet/net.go b/xsnet/net.go
index 9ba7cd8..ea1d912 100644
--- a/xsnet/net.go
+++ b/xsnet/net.go
@@ -9,7 +9,7 @@
 
 package xsnet
 
-// Implementation of HKEx-wrapped versions of the golang standard
+// Implementation of key-exchange-wrapped versions of the golang standard
 // net package interfaces, allowing clients and servers to simply replace
 // 'net.Dial' and 'net.Listen' with 'hkex.Dial' and 'hkex.Listen'
 // (though some extra methods are implemented and must be used
@@ -1084,7 +1084,7 @@ func (hl HKExListener) Close() error {
 	return hl.l.Close()
 }
 
-// Addr returns a the listener's network address.
+// Addr returns the listener's network address.
 //
 // See go doc net.Listener.Addr
 func (hl HKExListener) Addr() net.Addr {
diff --git a/xspasswd/xspasswd.go b/xspasswd/xspasswd.go
index 8cb41a9..ff18083 100644
--- a/xspasswd/xspasswd.go
+++ b/xspasswd/xspasswd.go
@@ -1,5 +1,5 @@
 // Util to generate/store passwords for users in a file akin to /etc/passwd
-// suitable for the demo hkexsh server, using bcrypt.
+// suitable for the xs server, using bcrypt.
 //
 // Copyright (c) 2017-2020 Russell Magee
 // Licensed under the terms of the MIT license (see LICENSE.mit in this