diff --git a/packages/subgraph/config/v1-lite.json b/packages/subgraph/config/v1-runtime.json
similarity index 69%
rename from packages/subgraph/config/v1-lite.json
rename to packages/subgraph/config/v1-runtime.json
index dccbcc449f..94ea6dff30 100644
--- a/packages/subgraph/config/v1-lite.json
+++ b/packages/subgraph/config/v1-runtime.json
@@ -1,48 +1,48 @@
 [
   {
-    "subgraphName": "connext/nxtp-mainnet-v1-lite",
+    "subgraphName": "connext/nxtp-mainnet-v1-runtime",
     "network": "mainnet",
     "address": "0x31eFc4AeAA7c39e54A33FDc3C46ee2Bd70ae0A09",
     "startBlock": 13548432
   },
   {
-    "subgraphName": "connext/nxtp-arbitrum-one-v1-lite",
+    "subgraphName": "connext/nxtp-arbitrum-one-v1-runtime",
     "network": "arbitrum-one",
     "address": "0xcF4d2994088a8CDE52FB584fE29608b63Ec063B2",
     "startBlock": 1915295
   },
   {
-    "subgraphName": "connext/nxtp-avalanche-v1-lite",
+    "subgraphName": "connext/nxtp-avalanche-v1-runtime",
     "network": "avalanche",
     "address": "0x31eFc4AeAA7c39e54A33FDc3C46ee2Bd70ae0A09",
     "startBlock": 5285668
   },
   {
-    "subgraphName": "connext/nxtp-bsc-v1-lite",
+    "subgraphName": "connext/nxtp-bsc-v1-runtime",
     "network": "bsc",
     "address": "0x2A9EA5e8cDDf40730f4f4F839F673a51600C314e",
     "startBlock": 11481191
   },
   {
-    "subgraphName": "connext/nxtp-fantom-v1-lite",
+    "subgraphName": "connext/nxtp-fantom-v1-runtime",
     "network": "fantom",
     "address": "0x0D29d9Fa94a23e0D2F06EfC79c25144A8F51Fc4b",
     "startBlock": 18291901
   },
   {
-    "subgraphName": "connext/nxtp-matic-v1-lite",
+    "subgraphName": "connext/nxtp-matic-v1-runtime",
     "network": "matic",
     "address": "0x6090De2EC76eb1Dc3B5d632734415c93c44Fd113",
     "startBlock": 19835794
   },
   {
-    "subgraphName": "connext/nxtp-moonriver-v1-lite",
+    "subgraphName": "connext/nxtp-moonriver-v1-runtime",
     "network": "moonriver",
     "address": "0x373ba9aa0f48b27A977F73423039E6dE341a0C7C",
     "startBlock": 863864
   },
   {
-    "subgraphName": "connext/nxtp-xdai-v1-lite",
+    "subgraphName": "connext/nxtp-xdai-v1-runtime",
     "network": "xdai",
     "address": "0x115909BDcbaB21954bEb4ab65FC2aBEE9866fa93",
     "startBlock": 18410655
diff --git a/packages/subgraph/package.json b/packages/subgraph/package.json
index b95c61a799..b87745f93a 100644
--- a/packages/subgraph/package.json
+++ b/packages/subgraph/package.json
@@ -10,10 +10,11 @@
     "purge": "yarn clean && rimraf ./node_modules",
     "deploy": "ts-node ./src/deploy.ts",
     "deploy:v0": "yarn deploy v0 v0",
-    "deploy:v1-lite": "yarn deploy v1-lite v1-lite",
-    "deploy:prod": "yarn deploy v1 prod",
-    "deploy:staging": "yarn deploy v1 staging",
-    "prepare:local": "yarn deploy v1 local mainnet",
+    "deploy:v1-analytics": "yarn deploy v1-analytics v1-analytics",
+    "deploy:v1-runtime": "yarn deploy v1-runtime v1-runtime",
+    "deploy:prod": "yarn deploy v1-analytics prod",
+    "deploy:staging": "yarn deploy v1-analytics staging",
+    "prepare:local": "yarn deploy v1-analytics local mainnet",
     "create-local-bsc": "graph create --node http://18.220.212.104:8020/ connext/nxtp-bsc",
     "create-local-1337": "graph create --node http://localhost:8020/ connext/nxtp",
     "remove-local-1337": "graph remove --node http://localhost:8020/ connext/nxtp",
diff --git a/packages/subgraph/src/deploy.ts b/packages/subgraph/src/deploy.ts
index d6f72ca25a..8612cc658b 100644
--- a/packages/subgraph/src/deploy.ts
+++ b/packages/subgraph/src/deploy.ts
@@ -16,7 +16,7 @@ export type Network = {
 const run = async () => {
   const cmdArg = process.argv.slice(2);
 
-  // first argument is contract version: v0 | v1
+  // first argument is contract version: v0 | v1-analytics | v1-runtime
   const contractVersion = cmdArg[0];
 
   // second argument is config file path: <config-file-name> local | prod | staging | v0
diff --git a/packages/subgraph/src/v1-lite/abis/TransactionManager.json b/packages/subgraph/src/v1-analytics/abis/TransactionManager.json
similarity index 100%
rename from packages/subgraph/src/v1-lite/abis/TransactionManager.json
rename to packages/subgraph/src/v1-analytics/abis/TransactionManager.json
diff --git a/packages/subgraph/src/v1/mapping.ts b/packages/subgraph/src/v1-analytics/mapping.ts
similarity index 100%
rename from packages/subgraph/src/v1/mapping.ts
rename to packages/subgraph/src/v1-analytics/mapping.ts
diff --git a/packages/subgraph/src/v1/schema.graphql b/packages/subgraph/src/v1-analytics/schema.graphql
similarity index 100%
rename from packages/subgraph/src/v1/schema.graphql
rename to packages/subgraph/src/v1-analytics/schema.graphql
diff --git a/packages/subgraph/src/v1/subgraph.template.yaml b/packages/subgraph/src/v1-analytics/subgraph.template.yaml
similarity index 92%
rename from packages/subgraph/src/v1/subgraph.template.yaml
rename to packages/subgraph/src/v1-analytics/subgraph.template.yaml
index 9cd30f37bc..a788a18506 100644
--- a/packages/subgraph/src/v1/subgraph.template.yaml
+++ b/packages/subgraph/src/v1-analytics/subgraph.template.yaml
@@ -1,6 +1,6 @@
 specVersion: 0.0.2
 schema:
-  file: ./src/v1/schema.graphql
+  file: ./src/v1-analytics/schema.graphql
 dataSources:
   - kind: ethereum/contract
     name: TransactionManager
@@ -22,7 +22,7 @@ dataSources:
         - TransactionPrepared
       abis:
         - name: TransactionManager
-          file: ./src/v1/abis/TransactionManager.json
+          file: ./src/v1-analytics/abis/TransactionManager.json
       eventHandlers:
         - event: LiquidityAdded(indexed address,indexed address,uint256,address)
           handler: handleLiquidityAdded
@@ -34,4 +34,4 @@ dataSources:
           handler: handleTransactionFulfilled
         - event: TransactionCancelled(indexed address,indexed address,indexed bytes32,((address,address,address,address,address,address,address,address,address,bytes32,bytes32,uint256,uint256,uint256,uint256,uint256),bytes,bytes),address)
           handler: handleTransactionCancelled
-      file: ./src/v1/mapping.ts
+      file: ./src/v1-analytics/mapping.ts
diff --git a/packages/subgraph/src/v1/abis/TransactionManager.json b/packages/subgraph/src/v1-runtime/abis/TransactionManager.json
similarity index 100%
rename from packages/subgraph/src/v1/abis/TransactionManager.json
rename to packages/subgraph/src/v1-runtime/abis/TransactionManager.json
diff --git a/packages/subgraph/src/v1-lite/mapping.ts b/packages/subgraph/src/v1-runtime/mapping.ts
similarity index 100%
rename from packages/subgraph/src/v1-lite/mapping.ts
rename to packages/subgraph/src/v1-runtime/mapping.ts
diff --git a/packages/subgraph/src/v1-lite/schema.graphql b/packages/subgraph/src/v1-runtime/schema.graphql
similarity index 100%
rename from packages/subgraph/src/v1-lite/schema.graphql
rename to packages/subgraph/src/v1-runtime/schema.graphql
diff --git a/packages/subgraph/src/v1-lite/subgraph.template.yaml b/packages/subgraph/src/v1-runtime/subgraph.template.yaml
similarity index 92%
rename from packages/subgraph/src/v1-lite/subgraph.template.yaml
rename to packages/subgraph/src/v1-runtime/subgraph.template.yaml
index 695c688397..20f952e76a 100644
--- a/packages/subgraph/src/v1-lite/subgraph.template.yaml
+++ b/packages/subgraph/src/v1-runtime/subgraph.template.yaml
@@ -1,6 +1,6 @@
 specVersion: 0.0.2
 schema:
-  file: ./src/v1-lite/schema.graphql
+  file: ./src/v1-runtime/schema.graphql
 dataSources:
   - kind: ethereum/contract
     name: TransactionManager
@@ -22,7 +22,7 @@ dataSources:
         - TransactionPrepared
       abis:
         - name: TransactionManager
-          file: ./src/v1-lite/abis/TransactionManager.json
+          file: ./src/v1-runtime/abis/TransactionManager.json
       eventHandlers:
         - event: LiquidityAdded(indexed address,indexed address,uint256,address)
           handler: handleLiquidityAdded
@@ -34,4 +34,4 @@ dataSources:
           handler: handleTransactionFulfilled
         - event: TransactionCancelled(indexed address,indexed address,indexed bytes32,((address,address,address,address,address,address,address,address,address,bytes32,bytes32,uint256,uint256,uint256,uint256,uint256),bytes,bytes),address)
           handler: handleTransactionCancelled
-      file: ./src/v1-lite/mapping.ts
+      file: ./src/v1-runtime/mapping.ts