diff --git a/lerna.json b/lerna.json
index 09c99665..9ee97682 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.2.52",
+  "version": "0.2.53",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {
diff --git a/packages/cache/package.json b/packages/cache/package.json
index 4141e048..39a9129d 100644
--- a/packages/cache/package.json
+++ b/packages/cache/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/cache",
-  "version": "0.2.52",
+  "version": "0.2.53",
   "description": "Generic object cache",
   "main": "dist/index.js",
   "scripts": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 4a100f89..880b1a49 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/cli",
-  "version": "0.2.52",
+  "version": "0.2.53",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "scripts": {
@@ -12,11 +12,11 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@cerc-io/cache": "^0.2.52",
-    "@cerc-io/ipld-eth-client": "^0.2.52",
-    "@cerc-io/peer": "^0.2.52",
-    "@cerc-io/rpc-eth-client": "^0.2.52",
-    "@cerc-io/util": "^0.2.52",
+    "@cerc-io/cache": "^0.2.53",
+    "@cerc-io/ipld-eth-client": "^0.2.53",
+    "@cerc-io/peer": "^0.2.53",
+    "@cerc-io/rpc-eth-client": "^0.2.53",
+    "@cerc-io/util": "^0.2.53",
     "@ethersproject/providers": "^5.4.4",
     "@graphql-tools/utils": "^9.1.1",
     "@ipld/dag-cbor": "^8.0.0",
diff --git a/packages/codegen/package.json b/packages/codegen/package.json
index de434673..b97288ce 100644
--- a/packages/codegen/package.json
+++ b/packages/codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/codegen",
-  "version": "0.2.52",
+  "version": "0.2.53",
   "description": "Code generator",
   "private": true,
   "main": "index.js",
@@ -20,7 +20,7 @@
   },
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
-    "@cerc-io/util": "^0.2.52",
+    "@cerc-io/util": "^0.2.53",
     "@graphql-tools/load-files": "^6.5.2",
     "@poanet/solidity-flattener": "https://github.com/vulcanize/solidity-flattener.git",
     "@solidity-parser/parser": "^0.13.2",
diff --git a/packages/codegen/src/templates/package-template.handlebars b/packages/codegen/src/templates/package-template.handlebars
index 4c0cd91a..9ffb327b 100644
--- a/packages/codegen/src/templates/package-template.handlebars
+++ b/packages/codegen/src/templates/package-template.handlebars
@@ -41,12 +41,12 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.52",
-    "@cerc-io/ipld-eth-client": "^0.2.52",
-    "@cerc-io/solidity-mapper": "^0.2.52",
-    "@cerc-io/util": "^0.2.52",
+    "@cerc-io/cli": "^0.2.53",
+    "@cerc-io/ipld-eth-client": "^0.2.53",
+    "@cerc-io/solidity-mapper": "^0.2.53",
+    "@cerc-io/util": "^0.2.53",
     {{#if (subgraphPath)}}
-    "@cerc-io/graph-node": "^0.2.52",
+    "@cerc-io/graph-node": "^0.2.53",
     {{/if}}
     "@ethersproject/providers": "^5.4.4",
     "apollo-type-bigint": "^0.1.3",
diff --git a/packages/graph-node/package.json b/packages/graph-node/package.json
index 8e8c0370..d606e872 100644
--- a/packages/graph-node/package.json
+++ b/packages/graph-node/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@cerc-io/graph-node",
-  "version": "0.2.52",
+  "version": "0.2.53",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
-    "@cerc-io/solidity-mapper": "^0.2.52",
+    "@cerc-io/solidity-mapper": "^0.2.53",
     "@ethersproject/providers": "^5.4.4",
     "@graphprotocol/graph-ts": "^0.22.0",
     "@nomiclabs/hardhat-ethers": "^2.0.2",
@@ -51,9 +51,9 @@
   "dependencies": {
     "@apollo/client": "^3.3.19",
     "@cerc-io/assemblyscript": "0.19.10-watcher-ts-0.1.2",
-    "@cerc-io/cache": "^0.2.52",
-    "@cerc-io/ipld-eth-client": "^0.2.52",
-    "@cerc-io/util": "^0.2.52",
+    "@cerc-io/cache": "^0.2.53",
+    "@cerc-io/ipld-eth-client": "^0.2.53",
+    "@cerc-io/util": "^0.2.53",
     "@types/json-diff": "^0.5.2",
     "@types/yargs": "^17.0.0",
     "bn.js": "^4.11.9",
diff --git a/packages/ipld-eth-client/package.json b/packages/ipld-eth-client/package.json
index f2460ee4..2a791bc1 100644
--- a/packages/ipld-eth-client/package.json
+++ b/packages/ipld-eth-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/ipld-eth-client",
-  "version": "0.2.52",
+  "version": "0.2.53",
   "description": "IPLD ETH Client",
   "main": "dist/index.js",
   "scripts": {
@@ -20,7 +20,7 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@cerc-io/cache": "^0.2.52",
+    "@cerc-io/cache": "^0.2.53",
     "cross-fetch": "^3.1.4",
     "debug": "^4.3.1",
     "ethers": "^5.4.4",
diff --git a/packages/peer/package.json b/packages/peer/package.json
index b1fa8418..05d74f74 100644
--- a/packages/peer/package.json
+++ b/packages/peer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/peer",
-  "version": "0.2.52",
+  "version": "0.2.53",
   "description": "libp2p module",
   "main": "dist/index.js",
   "exports": "./dist/index.js",
diff --git a/packages/rpc-eth-client/package.json b/packages/rpc-eth-client/package.json
index 53fbfa27..a85346e7 100644
--- a/packages/rpc-eth-client/package.json
+++ b/packages/rpc-eth-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/rpc-eth-client",
-  "version": "0.2.52",
+  "version": "0.2.53",
   "description": "RPC ETH Client",
   "main": "dist/index.js",
   "scripts": {
@@ -19,9 +19,9 @@
   },
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
-    "@cerc-io/cache": "^0.2.52",
-    "@cerc-io/ipld-eth-client": "^0.2.52",
-    "@cerc-io/util": "^0.2.52",
+    "@cerc-io/cache": "^0.2.53",
+    "@cerc-io/ipld-eth-client": "^0.2.53",
+    "@cerc-io/util": "^0.2.53",
     "chai": "^4.3.4",
     "ethers": "^5.4.4",
     "left-pad": "^1.3.0",
diff --git a/packages/solidity-mapper/package.json b/packages/solidity-mapper/package.json
index d28d3018..bb5e3cc5 100644
--- a/packages/solidity-mapper/package.json
+++ b/packages/solidity-mapper/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@cerc-io/solidity-mapper",
-  "version": "0.2.52",
+  "version": "0.2.53",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
-    "@cerc-io/ipld-eth-client": "^0.2.52",
+    "@cerc-io/ipld-eth-client": "^0.2.53",
     "@ethersproject/abi": "^5.3.0",
     "@nomiclabs/hardhat-ethers": "^2.0.2",
     "@nomiclabs/hardhat-waffle": "^2.0.1",
diff --git a/packages/test/package.json b/packages/test/package.json
index 34461d47..c68c4a69 100644
--- a/packages/test/package.json
+++ b/packages/test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/test",
-  "version": "0.2.52",
+  "version": "0.2.53",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "private": true,
diff --git a/packages/tracing-client/package.json b/packages/tracing-client/package.json
index 5f9be451..6f359e06 100644
--- a/packages/tracing-client/package.json
+++ b/packages/tracing-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/tracing-client",
-  "version": "0.2.52",
+  "version": "0.2.53",
   "description": "ETH VM tracing client",
   "main": "dist/index.js",
   "scripts": {
diff --git a/packages/util/package.json b/packages/util/package.json
index 5d061590..3c5b6ecc 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@cerc-io/util",
-  "version": "0.2.52",
+  "version": "0.2.53",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "dependencies": {
     "@apollo/utils.keyvaluecache": "^1.0.1",
-    "@cerc-io/nitro-client": "^0.1.5",
-    "@cerc-io/solidity-mapper": "^0.2.52",
+    "@cerc-io/nitro-node": "^0.1.8",
+    "@cerc-io/solidity-mapper": "^0.2.53",
     "@cerc-io/ts-channel": "1.0.3-ts-nitro-0.1.1",
     "@ethersproject/providers": "^5.4.4",
     "@graphql-tools/schema": "^9.0.10",
@@ -40,7 +40,7 @@
     "yargs": "^17.0.1"
   },
   "devDependencies": {
-    "@cerc-io/cache": "^0.2.52",
+    "@cerc-io/cache": "^0.2.53",
     "@nomiclabs/hardhat-waffle": "^2.0.1",
     "@types/express": "^4.17.14",
     "@types/fs-extra": "^9.0.11",
diff --git a/packages/util/src/payments.ts b/packages/util/src/payments.ts
index 966cb673..0c40a96b 100644
--- a/packages/util/src/payments.ts
+++ b/packages/util/src/payments.ts
@@ -6,8 +6,8 @@ import { Response as HTTPResponse } from 'apollo-server-env';
 
 import Channel from '@cerc-io/ts-channel';
 import type { ReadWriteChannel } from '@cerc-io/ts-channel';
-import type { Client, Voucher } from '@cerc-io/nitro-client';
-import { utils as nitroUtils, ChannelStatus } from '@cerc-io/nitro-client';
+import type { Node, Voucher } from '@cerc-io/nitro-node';
+import { utils as nitroUtils, ChannelStatus } from '@cerc-io/nitro-node';
 
 import { BaseRatesConfig, PaymentsConfig } from './config';
 
@@ -94,13 +94,13 @@ export class PaymentsManager {
     return this.ratesConfig.mutations ?? {};
   }
 
-  async subscribeToVouchers (client: Client): Promise<void> {
-    this.clientAddress = client.address;
+  async subscribeToVouchers (node: Node): Promise<void> {
+    this.clientAddress = node.address;
 
     // Load existing open payment channels with amount paid so far from the stored state
-    await this.loadPaymentChannels(client);
+    await this.loadPaymentChannels(node);
 
-    const receivedVouchersChannel = client.receivedVouchers();
+    const receivedVouchersChannel = node.receivedVouchers();
     log('Starting voucher subscription...');
 
     while (true) {
@@ -115,7 +115,7 @@ export class PaymentsManager {
             return;
           }
 
-          const associatedPaymentChannel = await client.getPaymentChannel(voucher.channelId);
+          const associatedPaymentChannel = await node.getPaymentChannel(voucher.channelId);
           const payer = associatedPaymentChannel.balance.payer;
 
           if (!voucher.amount) {
@@ -257,12 +257,12 @@ export class PaymentsManager {
     return [true, true];
   }
 
-  private async loadPaymentChannels (client: Client): Promise<void> {
-    const ledgerChannels = await client.getAllLedgerChannels();
+  private async loadPaymentChannels (node: Node): Promise<void> {
+    const ledgerChannels = await node.getAllLedgerChannels();
 
     for await (const ledgerChannel of ledgerChannels) {
       if (ledgerChannel.status === ChannelStatus.Open) {
-        const paymentChannels = await client.getPaymentChannelsByLedger(ledgerChannel.iD);
+        const paymentChannels = await node.getPaymentChannelsByLedger(ledgerChannel.iD);
 
         for (const paymentChannel of paymentChannels) {
           if (paymentChannel.status === ChannelStatus.Open) {