diff --git a/src/cmds/cns-cmds/account-cmds/get.ts b/src/cmds/cns-cmds/account-cmds/get.ts
index da3486d..10b0214 100644
--- a/src/cmds/cns-cmds/account-cmds/get.ts
+++ b/src/cmds/cns-cmds/account-cmds/get.ts
@@ -13,9 +13,9 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, privateKey, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   if (!address && privateKey) {
     address = new Account(Buffer.from(privateKey, 'hex')).getCosmosAddress();
diff --git a/src/cmds/cns-cmds/auction-cmds/bid-cmds/commit.ts b/src/cmds/cns-cmds/auction-cmds/bid-cmds/commit.ts
index a9c6527..94f8fb5 100644
--- a/src/cmds/cns-cmds/auction-cmds/bid-cmds/commit.ts
+++ b/src/cmds/cns-cmds/auction-cmds/bid-cmds/commit.ts
@@ -23,10 +23,10 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, privateKey, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
   assert(privateKey, 'Invalid Transaction Key.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const account = new Account(Buffer.from(privateKey, 'hex'));
   const bidderAddress = account.formattedCosmosAddress;
diff --git a/src/cmds/cns-cmds/auction-cmds/bid-cmds/reveal.ts b/src/cmds/cns-cmds/auction-cmds/bid-cmds/reveal.ts
index f7290d9..796ff49 100644
--- a/src/cmds/cns-cmds/auction-cmds/bid-cmds/reveal.ts
+++ b/src/cmds/cns-cmds/auction-cmds/bid-cmds/reveal.ts
@@ -18,10 +18,10 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, privateKey, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
   assert(privateKey, 'Invalid Transaction Key.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
   const fee = getGasAndFees(argv, cnsConfig);
diff --git a/src/cmds/cns-cmds/auction-cmds/get.ts b/src/cmds/cns-cmds/auction-cmds/get.ts
index 00f3bc9..c859a49 100644
--- a/src/cmds/cns-cmds/auction-cmds/get.ts
+++ b/src/cmds/cns-cmds/auction-cmds/get.ts
@@ -14,9 +14,9 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(config as string)
   const { restEndpoint, gqlEndpoint, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
   const result = await registry.getAuctionsByIds([id as string]);
diff --git a/src/cmds/cns-cmds/authority-cmds/bond-cmds/set.ts b/src/cmds/cns-cmds/authority-cmds/bond-cmds/set.ts
index 2bf39cd..6a97b51 100644
--- a/src/cmds/cns-cmds/authority-cmds/bond-cmds/set.ts
+++ b/src/cmds/cns-cmds/authority-cmds/bond-cmds/set.ts
@@ -16,10 +16,10 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, privateKey, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
   assert(privateKey, 'Invalid Transaction Key.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
   const fee = getGasAndFees(argv, cnsConfig);
diff --git a/src/cmds/cns-cmds/authority-cmds/reserve.ts b/src/cmds/cns-cmds/authority-cmds/reserve.ts
index 7bedf23..02988b6 100644
--- a/src/cmds/cns-cmds/authority-cmds/reserve.ts
+++ b/src/cmds/cns-cmds/authority-cmds/reserve.ts
@@ -22,10 +22,10 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, privateKey, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
   assert(privateKey, 'Invalid Transaction Key.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
   const fee = getGasAndFees(argv, cnsConfig);
diff --git a/src/cmds/cns-cmds/authority-cmds/whois.ts b/src/cmds/cns-cmds/authority-cmds/whois.ts
index 118f24c..90dfb1f 100644
--- a/src/cmds/cns-cmds/authority-cmds/whois.ts
+++ b/src/cmds/cns-cmds/authority-cmds/whois.ts
@@ -14,9 +14,9 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
   const result = await registry.lookupAuthorities([name], true);
diff --git a/src/cmds/cns-cmds/bond-cmds/associate.ts b/src/cmds/cns-cmds/bond-cmds/associate.ts
index 5f20a2f..75dd289 100644
--- a/src/cmds/cns-cmds/bond-cmds/associate.ts
+++ b/src/cmds/cns-cmds/bond-cmds/associate.ts
@@ -22,10 +22,10 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, privateKey, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
   assert(privateKey, 'Invalid Transaction Key.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
   const fee = getGasAndFees(argv, cnsConfig);
diff --git a/src/cmds/cns-cmds/bond-cmds/cancel.ts b/src/cmds/cns-cmds/bond-cmds/cancel.ts
index dda59ef..8b520df 100644
--- a/src/cmds/cns-cmds/bond-cmds/cancel.ts
+++ b/src/cmds/cns-cmds/bond-cmds/cancel.ts
@@ -14,10 +14,10 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, privateKey, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
   assert(privateKey, 'Invalid Transaction Key.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
   const fee = getGasAndFees(argv, cnsConfig);
diff --git a/src/cmds/cns-cmds/bond-cmds/create.ts b/src/cmds/cns-cmds/bond-cmds/create.ts
index 8479446..de99f60 100644
--- a/src/cmds/cns-cmds/bond-cmds/create.ts
+++ b/src/cmds/cns-cmds/bond-cmds/create.ts
@@ -27,10 +27,10 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(config as string)
   const { restEndpoint, gqlEndpoint, privateKey, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
   assert(privateKey, 'Invalid Transaction Key.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
   const fee = getGasAndFees(argv, cnsConfig);
diff --git a/src/cmds/cns-cmds/bond-cmds/dissociate.ts b/src/cmds/cns-cmds/bond-cmds/dissociate.ts
index 76d9185..7e0b475 100644
--- a/src/cmds/cns-cmds/bond-cmds/dissociate.ts
+++ b/src/cmds/cns-cmds/bond-cmds/dissociate.ts
@@ -14,10 +14,10 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, privateKey, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
   assert(privateKey, 'Invalid Transaction Key.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
   const fee = getGasAndFees(argv, cnsConfig);
diff --git a/src/cmds/cns-cmds/bond-cmds/get.ts b/src/cmds/cns-cmds/bond-cmds/get.ts
index ad2af5c..9cb83a5 100644
--- a/src/cmds/cns-cmds/bond-cmds/get.ts
+++ b/src/cmds/cns-cmds/bond-cmds/get.ts
@@ -14,9 +14,9 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(config as string)
   const { restEndpoint, gqlEndpoint, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
 
diff --git a/src/cmds/cns-cmds/bond-cmds/list.ts b/src/cmds/cns-cmds/bond-cmds/list.ts
index 965fa79..beff4cc 100644
--- a/src/cmds/cns-cmds/bond-cmds/list.ts
+++ b/src/cmds/cns-cmds/bond-cmds/list.ts
@@ -17,9 +17,9 @@ export const builder = {
 export const handler = async (argv: Arguments) => {
   const { services: { cns: cnsConfig } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
 
diff --git a/src/cmds/cns-cmds/bond-cmds/records-cmds/dissociate.ts b/src/cmds/cns-cmds/bond-cmds/records-cmds/dissociate.ts
index 136e4d4..341f365 100644
--- a/src/cmds/cns-cmds/bond-cmds/records-cmds/dissociate.ts
+++ b/src/cmds/cns-cmds/bond-cmds/records-cmds/dissociate.ts
@@ -20,10 +20,10 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, privateKey, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
   assert(privateKey, 'Invalid Transaction Key.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
   const fee = getGasAndFees(argv, cnsConfig);
diff --git a/src/cmds/cns-cmds/bond-cmds/records-cmds/reassociate.ts b/src/cmds/cns-cmds/bond-cmds/records-cmds/reassociate.ts
index 4e909e1..1fe897c 100644
--- a/src/cmds/cns-cmds/bond-cmds/records-cmds/reassociate.ts
+++ b/src/cmds/cns-cmds/bond-cmds/records-cmds/reassociate.ts
@@ -25,10 +25,10 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, privateKey, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
   assert(privateKey, 'Invalid Transaction Key.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
   const fee = getGasAndFees(argv, cnsConfig);
diff --git a/src/cmds/cns-cmds/bond-cmds/refill.ts b/src/cmds/cns-cmds/bond-cmds/refill.ts
index 0a23269..e8f4827 100644
--- a/src/cmds/cns-cmds/bond-cmds/refill.ts
+++ b/src/cmds/cns-cmds/bond-cmds/refill.ts
@@ -28,10 +28,10 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, privateKey, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
   assert(privateKey, 'Invalid Transaction Key.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
   const fee = getGasAndFees(argv, cnsConfig);
diff --git a/src/cmds/cns-cmds/bond-cmds/withdraw.ts b/src/cmds/cns-cmds/bond-cmds/withdraw.ts
index 1060e23..cc46a5c 100644
--- a/src/cmds/cns-cmds/bond-cmds/withdraw.ts
+++ b/src/cmds/cns-cmds/bond-cmds/withdraw.ts
@@ -28,10 +28,10 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, privateKey, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
   assert(privateKey, 'Invalid Transaction Key.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
   const fee = getGasAndFees(argv, cnsConfig);
diff --git a/src/cmds/cns-cmds/name-cmds/delete.ts b/src/cmds/cns-cmds/name-cmds/delete.ts
index 32ff8f9..e099def 100644
--- a/src/cmds/cns-cmds/name-cmds/delete.ts
+++ b/src/cmds/cns-cmds/name-cmds/delete.ts
@@ -14,10 +14,10 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, privateKey, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
   assert(privateKey, 'Invalid Transaction Key.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
   const fee = getGasAndFees(argv, cnsConfig);
diff --git a/src/cmds/cns-cmds/name-cmds/lookup.ts b/src/cmds/cns-cmds/name-cmds/lookup.ts
index 492f760..edbcbd1 100644
--- a/src/cmds/cns-cmds/name-cmds/lookup.ts
+++ b/src/cmds/cns-cmds/name-cmds/lookup.ts
@@ -20,9 +20,9 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
   const result = await registry.lookupNames([name], argv.history as boolean);
diff --git a/src/cmds/cns-cmds/name-cmds/resolve.ts b/src/cmds/cns-cmds/name-cmds/resolve.ts
index c6b651c..10b1d4d 100644
--- a/src/cmds/cns-cmds/name-cmds/resolve.ts
+++ b/src/cmds/cns-cmds/name-cmds/resolve.ts
@@ -14,9 +14,9 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
 
diff --git a/src/cmds/cns-cmds/name-cmds/set.ts b/src/cmds/cns-cmds/name-cmds/set.ts
index addb989..8f76dc4 100644
--- a/src/cmds/cns-cmds/name-cmds/set.ts
+++ b/src/cmds/cns-cmds/name-cmds/set.ts
@@ -16,10 +16,10 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, privateKey, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
   assert(privateKey, 'Invalid Transaction Key.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
   const fee = getGasAndFees(argv, cnsConfig);
diff --git a/src/cmds/cns-cmds/record-cmds/get.ts b/src/cmds/cns-cmds/record-cmds/get.ts
index 9d0fc81..7a9cd0a 100644
--- a/src/cmds/cns-cmds/record-cmds/get.ts
+++ b/src/cmds/cns-cmds/record-cmds/get.ts
@@ -14,9 +14,9 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(config as string)
   const { restEndpoint, gqlEndpoint, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
   const result = await registry.getRecordsByIds([id as string]);
diff --git a/src/cmds/cns-cmds/record-cmds/list.ts b/src/cmds/cns-cmds/record-cmds/list.ts
index d29ea02..a8731e7 100644
--- a/src/cmds/cns-cmds/record-cmds/list.ts
+++ b/src/cmds/cns-cmds/record-cmds/list.ts
@@ -29,9 +29,9 @@ export const handler = async (argv: Arguments) => {
   const { restEndpoint, gqlEndpoint, chainId } = getConnectionInfo(argv, cnsConfig);
   const { type, name, bondId, all } = argv;
 
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
 
diff --git a/src/cmds/cns-cmds/record-cmds/publish.ts b/src/cmds/cns-cmds/record-cmds/publish.ts
index 8944bc8..deb03a4 100644
--- a/src/cmds/cns-cmds/record-cmds/publish.ts
+++ b/src/cmds/cns-cmds/record-cmds/publish.ts
@@ -22,11 +22,11 @@ export const handler = async (argv: Arguments) => {
   const { services: { cns: cnsConfig } } = getConfig(config as string)
   const { restEndpoint, gqlEndpoint, userKey, bondId, chainId } = getConnectionInfo(argv, cnsConfig);
 
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
   assert(userKey, 'Invalid User Key.');
   assert(bondId, 'Invalid Bond ID.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   let file = null;
   if (filename) {
diff --git a/src/cmds/cns-cmds/status.ts b/src/cmds/cns-cmds/status.ts
index 80d7640..c22a565 100644
--- a/src/cmds/cns-cmds/status.ts
+++ b/src/cmds/cns-cmds/status.ts
@@ -6,14 +6,14 @@ import { getConfig, getConnectionInfo } from '../../util';
 
 export const command = 'status';
 
-export const desc = 'Get CNS status.';
+export const desc = 'Get Registry status.';
 
 export const handler = async (argv: Arguments) => {
   const { services: { cns } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, chainId } = getConnectionInfo(argv, cns);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
 
diff --git a/src/cmds/cns-cmds/tokens-cmds/send.ts b/src/cmds/cns-cmds/tokens-cmds/send.ts
index 1262d41..c19f293 100644
--- a/src/cmds/cns-cmds/tokens-cmds/send.ts
+++ b/src/cmds/cns-cmds/tokens-cmds/send.ts
@@ -28,10 +28,10 @@ export const handler = async (argv: Arguments) => {
 
   const { services: { cns: cnsConfig } } = getConfig(argv.config as string)
   const { restEndpoint, gqlEndpoint, privateKey, chainId } = getConnectionInfo(argv, cnsConfig);
-  assert(restEndpoint, 'Invalid CNS REST endpoint.');
-  assert(gqlEndpoint, 'Invalid CNS GQL endpoint.');
+  assert(restEndpoint, 'Invalid Registry REST endpoint.');
+  assert(gqlEndpoint, 'Invalid Registry GQL endpoint.');
   assert(privateKey, 'Invalid Transaction Key.');
-  assert(chainId, 'Invalid CNS Chain ID.');
+  assert(chainId, 'Invalid Registry Chain ID.');
 
   const account = new Account(Buffer.from(privateKey, 'hex'));
   const fromAddress = account.formattedCosmosAddress;
diff --git a/src/cmds/cns.ts b/src/cmds/cns.ts
index 3255ad0..5548242 100644
--- a/src/cmds/cns.ts
+++ b/src/cmds/cns.ts
@@ -2,7 +2,7 @@ import yargs from 'yargs';
 
 export const command = 'cns';
 
-export const desc = 'CNS tools';
+export const desc = 'Laconic Registry Tools';
 
 exports.builder = (yargs: yargs.Argv) => {
   return yargs