diff --git a/src/interfaces/network.interfaces.ts b/src/interfaces/network.interfaces.ts
index 9780711..43c05f1 100644
--- a/src/interfaces/network.interfaces.ts
+++ b/src/interfaces/network.interfaces.ts
@@ -118,9 +118,9 @@ export type INotarySignatureResponse = {
     amount: string;
     // Burn transaction ID
     id: string;
-    // First ZNT address
+    // First ABlock address
     from: string;
-    // Number of ZNT addresses that have participated
+    // Number of ABlock addresses that have participated
     cnt: number;
     // To Ethereum address
     to: string;
diff --git a/src/services/znt.service.ts b/src/services/ablock.service.ts
similarity index 100%
rename from src/services/znt.service.ts
rename to src/services/ablock.service.ts
diff --git a/src/services/index.ts b/src/services/index.ts
index bcedb70..8d2a767 100644
--- a/src/services/index.ts
+++ b/src/services/index.ts
@@ -1 +1 @@
-export * from './znt.service';
+export * from './ablock.service';
diff --git a/src/tests/__tests__/znt.service.test.ts b/src/tests/__tests__/ablock.service.test.ts
similarity index 83%
rename from src/tests/__tests__/znt.service.test.ts
rename to src/tests/__tests__/ablock.service.test.ts
index fe2a01f..a36c150 100644
--- a/src/tests/__tests__/znt.service.test.ts
+++ b/src/tests/__tests__/ablock.service.test.ts
@@ -1,10 +1,10 @@
 import { SEED } from '../constants';
-import { ABlockWallet } from '../../services/znt.service';
+import { ABlockWallet } from '../../services/ablock.service';
 
-let znpInstance = new ABlockWallet();
+let ablockInstance = new ABlockWallet();
 
 beforeEach(() => {
-    znpInstance = new ABlockWallet();
+    ablockInstance = new ABlockWallet();
 });
 
 test('handles key-pair re-generation from wallet seed phrase', async () => {
@@ -20,13 +20,13 @@ test('handles key-pair re-generation from wallet seed phrase', async () => {
         '28a7de5c30f8271be690db7a979e1be33d31f6b6aebaa3c82888354ba214c24d',
     ];
 
-    await znpInstance.initFromSeed(
+    await ablockInstance.initFromSeed(
         { mempoolHost: '', intercomHost: '', passPhrase: 'passphrase' },
         SEED,
         true,
     );
 
-    const foundAddresses = await znpInstance.regenAddresses(SEED, utxoAddressList, 6);
+    const foundAddresses = await ablockInstance.regenAddresses(SEED, utxoAddressList, 6);
 
     // Test to see if we have a success response from the client
     expect(foundAddresses.status).toBe('success');
diff --git a/src/tests/__tests__/key.mgmt.test.ts b/src/tests/__tests__/key.mgmt.test.ts
index c0d828a..965b63d 100644
--- a/src/tests/__tests__/key.mgmt.test.ts
+++ b/src/tests/__tests__/key.mgmt.test.ts
@@ -94,7 +94,7 @@ test('derives deterministic signable keypairs through ed25519, via seed', () =>
     }
 });
 
-// NOTE: This test corresponds with `test_construct_valid_addresses` in NAOM
+// NOTE: This test corresponds with `test_construct_valid_addresses` in Chain 
 test('generates a valid payment address with the temporary address structure', () => {
     const actual = [
         keyMgmt
diff --git a/src/tests/__tests__/receipts.mgmt.test.ts b/src/tests/__tests__/receipts.mgmt.test.ts
index 9ed30e1..405c42a 100644
--- a/src/tests/__tests__/receipts.mgmt.test.ts
+++ b/src/tests/__tests__/receipts.mgmt.test.ts
@@ -355,7 +355,7 @@ test('create transaction for the RECEIVE portion of a receipt-based payment', ()
     }
 });
 
-// NOTE: This test corresponds with `test_construct_valid_tx_ins_address` in NAOM
+// NOTE: This test corresponds with `test_construct_valid_tx_ins_address` in Chain
 test('create TxIns address used as `from` value in DdeValues', () => {
     const keyPairMap = new Map<string, IKeypair>();
     for (const addr of Object.keys(ADDRESS_LIST_TEST)) {
@@ -380,7 +380,7 @@ test('create TxIns address used as `from` value in DdeValues', () => {
     }
 });
 
-//NOTE: This test corresponds with `test_construct_valid_tx_in_signable_asset_hash` in NAOM
+//NOTE: This test corresponds with `test_construct_valid_tx_in_signable_asset_hash` in Chain
 //TODO: Add test for `DataAsset` variant
 test('creates a valid signable asset hash value', () => {
     const signableTxInAssetHashes: string[] = [