diff --git a/src/lib/consts.ts b/src/lib/consts.ts
index 9d54e84..3d8d61a 100644
--- a/src/lib/consts.ts
+++ b/src/lib/consts.ts
@@ -19,61 +19,57 @@ import {
 } from "viem/chains";
 
 export const CHAINS = {
-  MAINNET: "mainnet",
   ARBITRUM_ONE: "arbitrum_one",
   AVALANCHE: "avalanche",
   BASE: "base",
   BSC: "bsc",
   CELO: "celo",
+  ETHEREUM: "mainnet",
   FANTOM: "fantom",
   FUSE: "fuse",
   MATIC: "matic",
   MOONBEAM: "moonbeam",
   OPTIMISM: "optimism",
   SEPOLIA: "sepolia",
-  XDAI: "xdai",
+  GNOSIS: "gnosis",
   ZKSYNCERA: "zksyncera",
 };
 
 export const CHAIN_SCAN_URLS = {
-  [CHAINS.MAINNET]: "https://etherscan.io",
   [CHAINS.ARBITRUM_ONE]: "https://arbiscan.io",
   [CHAINS.AVALANCHE]: "https://cchain.explorer.avax.network",
   [CHAINS.BASE]: "https://basescan.org",
   [CHAINS.BSC]: "https://bscscan.com",
   [CHAINS.CELO]: "https://explorer.celo.org",
+  [CHAINS.ETHEREUM]: "https://etherscan.io",
   [CHAINS.FANTOM]: "https://ftmscan.com",
   [CHAINS.FUSE]: "https://explorer.fuse.io",
   [CHAINS.MATIC]: "https://explorer-mainnet.maticvigil.com",
   [CHAINS.MOONBEAM]: "https://moonbeam-explorer.netlify.app",
   [CHAINS.OPTIMISM]: "https://optimistic.etherscan.io",
   [CHAINS.SEPOLIA]: "https://sepolia.etherscan.io",
-  [CHAINS.XDAI]: "https://gnosisscan.io",
+  [CHAINS.GNOSIS]: "https://gnosisscan.io",
   [CHAINS.ZKSYNCERA]: "https://explorer.zksync.io",
 };
 
 export enum PAYMENT_CHAINS {
-  MAINNET = "payment_mainnet",
   ARBITRUM_ONE = "payment_arbitrum_one",
   AVALANCHE = "payment_avalanche",
   BASE = "payment_base",
   BSC = "payment_bsc",
   CELO = "payment_celo",
+  ETHEREUM = "payment_ethereum",
   FANTOM = "payment_fantom",
   FUSE = "payment_fuse",
   MATIC = "payment_matic",
   MOONBEAM = "payment_moonbeam",
   OPTIMISM = "payment_optimism",
   SEPOLIA = "payment_sepolia",
-  XDAI = "payment_xdai",
+  GNOSIS = "payment_gnosis",
   ZKSYNCERA = "payment_zksyncera",
 }
 
 export const PUBLIC_CLIENTS = {
-  [CHAINS.MAINNET]: createPublicClient({
-    chain: mainnet,
-    transport: http(),
-  }),
   [CHAINS.ARBITRUM_ONE]: createPublicClient({
     chain: arbitrum,
     transport: http(),
@@ -94,6 +90,10 @@ export const PUBLIC_CLIENTS = {
     chain: celo,
     transport: http(),
   }),
+  [CHAINS.ETHEREUM]: createPublicClient({
+    chain: mainnet,
+    transport: http(),
+  }),
   [CHAINS.FANTOM]: createPublicClient({
     chain: fantom,
     transport: http(),
@@ -118,7 +118,7 @@ export const PUBLIC_CLIENTS = {
     chain: sepolia,
     transport: http(),
   }),
-  [CHAINS.XDAI]: createPublicClient({
+  [CHAINS.GNOSIS]: createPublicClient({
     chain: gnosis,
     transport: http(),
   }),
diff --git a/src/lib/hooks/payments.ts b/src/lib/hooks/payments.ts
index 5f2e0c0..1cb98f0 100644
--- a/src/lib/hooks/payments.ts
+++ b/src/lib/hooks/payments.ts
@@ -10,7 +10,7 @@ export const PAYMENTS_QUERY = gql`
   ${CORE_PAYMENT_FIELDS}
   query PaymentsQuery($first: Int, $skip: Int!) {
     #
-    payment_mainnet {
+    payment_arbitrum_one {
       payments(
         first: $first
         skip: $skip
@@ -20,7 +20,7 @@ export const PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_arbitrum_one {
+    payment_avalanche {
       payments(
         first: $first
         skip: $skip
@@ -30,7 +30,7 @@ export const PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_avalanche {
+    payment_base {
       payments(
         first: $first
         skip: $skip
@@ -40,7 +40,7 @@ export const PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_base {
+    payment_bsc {
       payments(
         first: $first
         skip: $skip
@@ -50,7 +50,7 @@ export const PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_bsc {
+    payment_celo {
       payments(
         first: $first
         skip: $skip
@@ -60,7 +60,7 @@ export const PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_celo {
+    payment_ethereum {
       payments(
         first: $first
         skip: $skip
@@ -130,7 +130,7 @@ export const PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_xdai {
+    payment_gnosis {
       payments(
         first: $first
         skip: $skip
diff --git a/src/lib/queries/address-payments.ts b/src/lib/queries/address-payments.ts
index c21894c..ac74828 100644
--- a/src/lib/queries/address-payments.ts
+++ b/src/lib/queries/address-payments.ts
@@ -9,7 +9,7 @@ import { CORE_PAYMENT_FIELDS } from "./utils";
 export const ADDRESS_PAYMENTS_QUERY = gql`
   ${CORE_PAYMENT_FIELDS}
   query AddressPaymentsQuery($first: Int, $skip: Int!, $address: Bytes) {
-    payment_mainnet {
+    payment_arbitrum_one {
       payments(
         first: $first
         skip: $skip
@@ -20,7 +20,7 @@ export const ADDRESS_PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_arbitrum_one {
+    payment_avalanche {
       payments(
         first: $first
         skip: $skip
@@ -31,7 +31,7 @@ export const ADDRESS_PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_avalanche {
+    payment_base {
       payments(
         first: $first
         skip: $skip
@@ -42,7 +42,7 @@ export const ADDRESS_PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_base {
+    payment_bsc {
       payments(
         first: $first
         skip: $skip
@@ -53,7 +53,7 @@ export const ADDRESS_PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_bsc {
+    payment_celo {
       payments(
         first: $first
         skip: $skip
@@ -64,7 +64,7 @@ export const ADDRESS_PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_celo {
+    payment_ethereum {
       payments(
         first: $first
         skip: $skip
@@ -141,7 +141,7 @@ export const ADDRESS_PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_xdai {
+    payment_gnosis {
       payments(
         first: $first
         skip: $skip
diff --git a/src/lib/queries/payments.ts b/src/lib/queries/payments.ts
index 1ac548b..16d14f7 100644
--- a/src/lib/queries/payments.ts
+++ b/src/lib/queries/payments.ts
@@ -10,7 +10,7 @@ export const PAYMENTS_QUERY = gql`
   ${CORE_PAYMENT_FIELDS}
   query PaymentsQuery($first: Int, $skip: Int!) {
     #
-    payment_mainnet {
+    payment_arbitrum_one {
       payments(
         first: $first
         skip: $skip
@@ -20,7 +20,7 @@ export const PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_arbitrum_one {
+    payment_avalanche {
       payments(
         first: $first
         skip: $skip
@@ -30,7 +30,7 @@ export const PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_avalanche {
+    payment_base {
       payments(
         first: $first
         skip: $skip
@@ -40,7 +40,7 @@ export const PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_base {
+    payment_bsc {
       payments(
         first: $first
         skip: $skip
@@ -50,7 +50,7 @@ export const PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_bsc {
+    payment_celo {
       payments(
         first: $first
         skip: $skip
@@ -60,7 +60,7 @@ export const PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_celo {
+    payment_ethereum {
       payments(
         first: $first
         skip: $skip
@@ -130,7 +130,7 @@ export const PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_xdai {
+    payment_gnosis {
       payments(
         first: $first
         skip: $skip
diff --git a/src/lib/queries/request-payments.ts b/src/lib/queries/request-payments.ts
index c488570..0fb49b5 100644
--- a/src/lib/queries/request-payments.ts
+++ b/src/lib/queries/request-payments.ts
@@ -11,16 +11,16 @@ export const REQUEST_PAYMENTS_QUERY = gql`
 
   query RequestPaymentsQuery($reference: Bytes!) @cached {
     #
-    payment_mainnet {
+    payment_arbitrum_one {
       payments(
+        where: { reference: $reference }
         orderBy: timestamp
         orderDirection: desc
-        where: { reference: $reference }
       ) {
         ...PaymentFields
       }
     }
-    payment_arbitrum_one {
+    payment_avalanche {
       payments(
         where: { reference: $reference }
         orderBy: timestamp
@@ -29,7 +29,7 @@ export const REQUEST_PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_avalanche {
+    payment_base {
       payments(
         where: { reference: $reference }
         orderBy: timestamp
@@ -38,7 +38,7 @@ export const REQUEST_PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_base {
+    payment_bsc {
       payments(
         where: { reference: $reference }
         orderBy: timestamp
@@ -47,7 +47,7 @@ export const REQUEST_PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_bsc {
+    payment_celo {
       payments(
         where: { reference: $reference }
         orderBy: timestamp
@@ -56,11 +56,11 @@ export const REQUEST_PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_celo {
+    payment_ethereum {
       payments(
-        where: { reference: $reference }
         orderBy: timestamp
         orderDirection: desc
+        where: { reference: $reference }
       ) {
         ...PaymentFields
       }
@@ -119,7 +119,7 @@ export const REQUEST_PAYMENTS_QUERY = gql`
         ...PaymentFields
       }
     }
-    payment_xdai {
+    payment_gnosis {
       payments(
         where: { reference: $reference }
         orderBy: timestamp
diff --git a/src/lib/queries/srf-deployments.ts b/src/lib/queries/srf-deployments.ts
index 77570bc..43c8396 100644
--- a/src/lib/queries/srf-deployments.ts
+++ b/src/lib/queries/srf-deployments.ts
@@ -7,7 +7,7 @@ import { CORE_PROXY_DEPLOYMENT_FIELDS } from "./utils";
 export const PROXY_DEPLOYMENTS_QUERY = gql`
   ${CORE_PROXY_DEPLOYMENT_FIELDS}
   query ProxyDeploymentsQuery($first: Int!, $skip: Int!) {
-    payment_mainnet {
+    payment_arbitrum_one {
       singleRequestProxyDeployments(
         first: $first
         skip: $skip
@@ -17,7 +17,7 @@ export const PROXY_DEPLOYMENTS_QUERY = gql`
         ...ProxyDeploymentFields
       }
     }
-    payment_arbitrum_one {
+    payment_avalanche {
       singleRequestProxyDeployments(
         first: $first
         skip: $skip
@@ -27,7 +27,7 @@ export const PROXY_DEPLOYMENTS_QUERY = gql`
         ...ProxyDeploymentFields
       }
     }
-    payment_avalanche {
+    payment_base {
       singleRequestProxyDeployments(
         first: $first
         skip: $skip
@@ -37,7 +37,7 @@ export const PROXY_DEPLOYMENTS_QUERY = gql`
         ...ProxyDeploymentFields
       }
     }
-    payment_base {
+    payment_bsc {
       singleRequestProxyDeployments(
         first: $first
         skip: $skip
@@ -47,7 +47,7 @@ export const PROXY_DEPLOYMENTS_QUERY = gql`
         ...ProxyDeploymentFields
       }
     }
-    payment_bsc {
+    payment_celo {
       singleRequestProxyDeployments(
         first: $first
         skip: $skip
@@ -57,7 +57,7 @@ export const PROXY_DEPLOYMENTS_QUERY = gql`
         ...ProxyDeploymentFields
       }
     }
-    payment_celo {
+    payment_ethereum {
       singleRequestProxyDeployments(
         first: $first
         skip: $skip
@@ -97,7 +97,7 @@ export const PROXY_DEPLOYMENTS_QUERY = gql`
         ...ProxyDeploymentFields
       }
     }
-    payment_xdai {
+    payment_gnosis {
       singleRequestProxyDeployments(
         first: $first
         skip: $skip
@@ -141,11 +141,6 @@ export const fetchProxyDeployments = async (variables: {
 export const PROXY_DEPLOYMENTS_BY_REFERENCE_QUERY = gql`
   ${CORE_PROXY_DEPLOYMENT_FIELDS}
   query ProxyDeploymentsByReferenceQuery($reference: Bytes!) {
-    payment_mainnet {
-      singleRequestProxyDeployments(where: { paymentReference: $reference }) {
-        ...ProxyDeploymentFields
-      }
-    }
     payment_arbitrum_one {
       singleRequestProxyDeployments(where: { paymentReference: $reference }) {
         ...ProxyDeploymentFields
@@ -171,6 +166,11 @@ export const PROXY_DEPLOYMENTS_BY_REFERENCE_QUERY = gql`
         ...ProxyDeploymentFields
       }
     }
+    payment_ethereum {
+      singleRequestProxyDeployments(where: { paymentReference: $reference }) {
+        ...ProxyDeploymentFields
+      }
+    }
     payment_matic {
       singleRequestProxyDeployments(where: { paymentReference: $reference }) {
         ...ProxyDeploymentFields
@@ -186,7 +186,7 @@ export const PROXY_DEPLOYMENTS_BY_REFERENCE_QUERY = gql`
         ...ProxyDeploymentFields
       }
     }
-    payment_xdai {
+    payment_gnosis {
       singleRequestProxyDeployments(where: { paymentReference: $reference }) {
         ...ProxyDeploymentFields
       }