diff --git a/bindings/cmix.go b/bindings/cmix.go
index 432116eac16c954f7aa5b967f483f6cbd675c52b..2003f7c2fa876a091325fdd5b1f04a3bc710de98 100644
--- a/bindings/cmix.go
+++ b/bindings/cmix.go
@@ -34,7 +34,7 @@ type Cmix struct {
 //
 // Users of this function should delete the storage directory on error.
 func NewKeystore(network, storageDir string, password []byte, regCode string) error {
-	if err := xxdk.NewClient(network, storageDir, password, regCode); err != nil {
+	if err := xxdk.NewCmix(network, storageDir, password, regCode); err != nil {
 		return errors.New(fmt.Sprintf("Failed to create new client: %+v",
 			err))
 	}
diff --git a/cmd/root.go b/cmd/root.go
index bd49ab29c517a2b51a7f2058f3dba526624f0a76..d9373fe1ae63ae380573fab85b4e2585d3ac7aa4 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -597,7 +597,7 @@ func createClient() *xxdk.Cmix {
 			}
 
 		} else {
-			err = xxdk.NewClient(string(ndfJSON), storeDir,
+			err = xxdk.NewCmix(string(ndfJSON), storeDir,
 				pass, regCode)
 		}
 
diff --git a/restlike/README.md b/restlike/README.md
index f4c117e7378c4eb896f0ffe45b0a2e752c420483..2e09682c082ed75239e3346f1d4337f02bf641c7 100644
--- a/restlike/README.md
+++ b/restlike/README.md
@@ -18,11 +18,11 @@ ndfJson, err := xxdk.DownloadAndVerifySignedNdfWithUrl(url, cert)
 Example:
 
 ```go
-err := xxdk.NewClient(ndfJson, "/clientStorage", []byte("testPassword"), "")
+err := xxdk.NewCmix(ndfJson, "/clientStorage", []byte("testPassword"), "")
 ```
 
 3. LoadCmix in order to obtain the xxdk.Cmix object.
-   `storageDir` and `password` may be customized, but must match the values provided to `NewClient()`.
+   `storageDir` and `password` may be customized, but must match the values provided to `NewCmix()`.
    The result of `xxdk.GetDefaultParams()` may also be freely modified according to your needs.
 
 Example:
diff --git a/xxdk/cmix.go b/xxdk/cmix.go
index ee7d46949613fcb6d79221a8a057532f465ec68f..e8aaed28256b8c1ff8b7b4ae98190b4a1a35cce8 100644
--- a/xxdk/cmix.go
+++ b/xxdk/cmix.go
@@ -61,13 +61,13 @@ type Cmix struct {
 	events *event.Manager
 }
 
-// NewClient creates client storage, generates keys, connects, and registers
+// NewCmix creates client 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.
-func NewClient(ndfJSON, storageDir string, password []byte,
+func NewCmix(ndfJSON, storageDir string, password []byte,
 	registrationCode string) error {
-	jww.INFO.Printf("NewClient(dir: %s)", storageDir)
+	jww.INFO.Printf("NewCmix(dir: %s)", storageDir)
 	rngStreamGen := fastRNG.NewStreamGenerator(12, 1024,
 		csprng.NewSystemRNG)
 
@@ -566,7 +566,7 @@ func DecodeGroups(ndf *ndf.NetworkDefinition) (cmixGrp, e2eGrp *cyclic.Group) {
 	return cmixGrp, e2eGrp
 }
 
-// CheckVersionAndSetupStorage is common code shared by NewClient,
+// CheckVersionAndSetupStorage is common code shared by NewCmix,
 // NewPrecannedClient and NewVanityClient it checks client version and
 // creates a new storage for user data
 func CheckVersionAndSetupStorage(def *ndf.NetworkDefinition,
diff --git a/xxdk/utils_test.go b/xxdk/utils_test.go
index 2f6afc7196c3f2e554482ab848f290a83084ec7c..e537fc3b9f7863f5ee051d03c61dc4dd0fc60937 100644
--- a/xxdk/utils_test.go
+++ b/xxdk/utils_test.go
@@ -39,7 +39,7 @@ func newTestingClient(face interface{}) (*Cmix, error) {
 	marshalledDef, _ := def.Marshal()
 	storageDir := "ignore.1"
 	password := []byte("hunter2")
-	err := NewClient(string(marshalledDef), storageDir, password, "AAAA")
+	err := NewCmix(string(marshalledDef), storageDir, password, "AAAA")
 	if err != nil {
 		return nil, errors.Errorf(
 			"Could not construct a mock client: %v", err)