diff --git a/crawlers/deploy/deploy.bash b/crawlers/deploy/deploy.bash
index 6c96df55..a089007f 100755
--- a/crawlers/deploy/deploy.bash
+++ b/crawlers/deploy/deploy.bash
@@ -146,11 +146,11 @@ XAI_MISSING_TIMER_FILE="xai-missing.timer"
 XAI_MOONWORM_CRAWLER_SERVICE_FILE="xai-moonworm-crawler.service"
 XAI_SYNCHRONIZE_SERVICE="xai-synchronize.service"
 
-# Xai testnet
-XAI_TESTNET_MISSING_SERVICE_FILE="xai-testnet-missing.service"
-XAI_TESTNET_MISSING_TIMER_FILE="xai-testnet-missing.timer"
-XAI_TESTNET_MOONWORM_CRAWLER_SERVICE_FILE="xai-testnet-moonworm-crawler.service"
-XAI_TESTNET_SYNCHRONIZE_SERVICE="xai-testnet-synchronize.service"
+# Xai sepolia
+XAI_SEPOLIA_MISSING_SERVICE_FILE="xai-sepolia-missing.service"
+XAI_SEPOLIA_MISSING_TIMER_FILE="xai-sepolia-missing.timer"
+XAI_SEPOLIA_MOONWORM_CRAWLER_SERVICE_FILE="xai-sepolia-moonworm-crawler.service"
+XAI_SEPOLIA_SYNCHRONIZE_SERVICE="xai-sepolia-synchronize.service"
 
 set -eu
 
@@ -724,28 +724,28 @@ XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${XAI_MOONWORM_CRAWLER_SERVICE_FILE}"
 
 
-# Xai testnet
+# Xai sepolia
 echo
 echo
-echo -e "${PREFIX_INFO} Replacing existing Xai testnet block with transactions syncronizer service definition with ${XAI_TESTNET_SYNCHRONIZE_SERVICE}"
-chmod 644 "${SCRIPT_DIR}/${XAI_TESTNET_SYNCHRONIZE_SERVICE}"
-cp "${SCRIPT_DIR}/${XAI_TESTNET_SYNCHRONIZE_SERVICE}" "/home/ubuntu/.config/systemd/user/${XAI_TESTNET_SYNCHRONIZE_SERVICE}"
+echo -e "${PREFIX_INFO} Replacing existing Xai sepolia block with transactions syncronizer service definition with ${XAI_SEPOLIA_SYNCHRONIZE_SERVICE}"
+chmod 644 "${SCRIPT_DIR}/${XAI_SEPOLIA_SYNCHRONIZE_SERVICE}"
+cp "${SCRIPT_DIR}/${XAI_SEPOLIA_SYNCHRONIZE_SERVICE}" "/home/ubuntu/.config/systemd/user/${XAI_SEPOLIA_SYNCHRONIZE_SERVICE}"
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${XAI_TESTNET_SYNCHRONIZE_SERVICE}"
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${XAI_SEPOLIA_SYNCHRONIZE_SERVICE}"
 
 echo
 echo
-echo -e "${PREFIX_INFO} Replacing existing Xai testnet missing service and timer with: ${XAI_TESTNET_MISSING_SERVICE_FILE}, ${XAI_TESTNET_MISSING_TIMER_FILE}"
-chmod 644 "${SCRIPT_DIR}/${XAI_TESTNET_MISSING_SERVICE_FILE}" "${SCRIPT_DIR}/${XAI_TESTNET_MISSING_TIMER_FILE}"
-cp "${SCRIPT_DIR}/${XAI_TESTNET_MISSING_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${XAI_TESTNET_MISSING_SERVICE_FILE}"
-cp "${SCRIPT_DIR}/${XAI_TESTNET_MISSING_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${XAI_TESTNET_MISSING_TIMER_FILE}"
+echo -e "${PREFIX_INFO} Replacing existing Xai sepolia missing service and timer with: ${XAI_SEPOLIA_MISSING_SERVICE_FILE}, ${XAI_SEPOLIA_MISSING_TIMER_FILE}"
+chmod 644 "${SCRIPT_DIR}/${XAI_SEPOLIA_MISSING_SERVICE_FILE}" "${SCRIPT_DIR}/${XAI_SEPOLIA_MISSING_TIMER_FILE}"
+cp "${SCRIPT_DIR}/${XAI_SEPOLIA_MISSING_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${XAI_SEPOLIA_MISSING_SERVICE_FILE}"
+cp "${SCRIPT_DIR}/${XAI_SEPOLIA_MISSING_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${XAI_SEPOLIA_MISSING_TIMER_FILE}"
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${XAI_TESTNET_MISSING_TIMER_FILE}"
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${XAI_SEPOLIA_MISSING_TIMER_FILE}"
 
 echo
 echo
-echo -e "${PREFIX_INFO} Replacing existing Xai testnet moonworm crawler service definition with ${XAI_TESTNET_MOONWORM_CRAWLER_SERVICE_FILE}"
-chmod 644 "${SCRIPT_DIR}/${XAI_TESTNET_MOONWORM_CRAWLER_SERVICE_FILE}"
-cp "${SCRIPT_DIR}/${XAI_TESTNET_MOONWORM_CRAWLER_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${XAI_TESTNET_MOONWORM_CRAWLER_SERVICE_FILE}"
+echo -e "${PREFIX_INFO} Replacing existing Xai sepolia moonworm crawler service definition with ${XAI_SEPOLIA_MOONWORM_CRAWLER_SERVICE_FILE}"
+chmod 644 "${SCRIPT_DIR}/${XAI_SEPOLIA_MOONWORM_CRAWLER_SERVICE_FILE}"
+cp "${SCRIPT_DIR}/${XAI_SEPOLIA_MOONWORM_CRAWLER_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${XAI_SEPOLIA_MOONWORM_CRAWLER_SERVICE_FILE}"
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${XAI_TESTNET_MOONWORM_CRAWLER_SERVICE_FILE}"
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${XAI_SEPOLIA_MOONWORM_CRAWLER_SERVICE_FILE}"
diff --git a/crawlers/deploy/monitoring-crawlers.service b/crawlers/deploy/monitoring-crawlers.service
index a6d2d1a8..8b8f15b5 100644
--- a/crawlers/deploy/monitoring-crawlers.service
+++ b/crawlers/deploy/monitoring-crawlers.service
@@ -9,7 +9,7 @@ Restart=on-failure
 RestartSec=15s
 WorkingDirectory=/home/ubuntu/
 EnvironmentFile=/home/ubuntu/moonstream-secrets/monitoring.env
-ExecStart=/home/ubuntu/monitoring -plugin systemd -host "${AWS_LOCAL_IPV4}" -port 7171 -healthcheck -server -threshold 3 -config /home/ubuntu/.monitoring/monitoring-crawlers-config.json -service ethereum-moonworm-crawler.service -service mumbai-moonworm-crawler.service -service polygon-moonworm-crawler.service -service zksync-era-moonworm-crawler.service -service arbitrum-nova-moonworm-crawler.service -service arbitrum-sepolia-moonworm-crawler.service -service xai-moonworm-crawler.service -service xai-testnet-moonworm-crawler.service
+ExecStart=/home/ubuntu/monitoring -plugin systemd -host "${AWS_LOCAL_IPV4}" -port 7171 -healthcheck -server -threshold 3 -config /home/ubuntu/.monitoring/monitoring-crawlers-config.json -service ethereum-moonworm-crawler.service -service mumbai-moonworm-crawler.service -service polygon-moonworm-crawler.service -service zksync-era-moonworm-crawler.service -service arbitrum-nova-moonworm-crawler.service -service arbitrum-sepolia-moonworm-crawler.service -service xai-moonworm-crawler.service -service xai-sepolia-moonworm-crawler.service
 CPUWeight=90
 SyslogIdentifier=monitoring-crawlers
 
diff --git a/crawlers/deploy/xai-testnet-missing.service b/crawlers/deploy/xai-sepolia-missing.service
similarity index 72%
rename from crawlers/deploy/xai-testnet-missing.service
rename to crawlers/deploy/xai-sepolia-missing.service
index 2f88a1d7..b37d5fee 100644
--- a/crawlers/deploy/xai-testnet-missing.service
+++ b/crawlers/deploy/xai-sepolia-missing.service
@@ -1,11 +1,11 @@
 [Unit]
-Description=Fill missing blocks at Xai testnet database
+Description=Fill missing blocks at Xai sepolia database
 After=network.target
 
 [Service]
 Type=oneshot
 WorkingDirectory=/home/ubuntu/moonstream/crawlers/mooncrawl
 EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
-ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.crawler --access-id "${NB_CONTROLLER_ACCESS_ID}" blocks missing --blockchain xai_testnet -n
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.crawler --access-id "${NB_CONTROLLER_ACCESS_ID}" blocks missing --blockchain xai_sepolia -n
 CPUWeight=50
-SyslogIdentifier=xai-testnet-missing
\ No newline at end of file
+SyslogIdentifier=xai-sepolia-missing
\ No newline at end of file
diff --git a/crawlers/deploy/xai-testnet-missing.timer b/crawlers/deploy/xai-sepolia-missing.timer
similarity index 60%
rename from crawlers/deploy/xai-testnet-missing.timer
rename to crawlers/deploy/xai-sepolia-missing.timer
index 6ed3613c..d5fd1ca3 100644
--- a/crawlers/deploy/xai-testnet-missing.timer
+++ b/crawlers/deploy/xai-sepolia-missing.timer
@@ -1,5 +1,5 @@
 [Unit]
-Description=Fill missing blocks at Xai testnet database
+Description=Fill missing blocks at Xai sepolia database
 
 [Timer]
 OnBootSec=120s
diff --git a/crawlers/deploy/xai-testnet-moonworm-crawler.service b/crawlers/deploy/xai-sepolia-moonworm-crawler.service
similarity index 69%
rename from crawlers/deploy/xai-testnet-moonworm-crawler.service
rename to crawlers/deploy/xai-sepolia-moonworm-crawler.service
index 77468341..78eb884b 100644
--- a/crawlers/deploy/xai-testnet-moonworm-crawler.service
+++ b/crawlers/deploy/xai-sepolia-moonworm-crawler.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Xai testnet moonworm crawler
+Description=Xai sepolia moonworm crawler
 After=network.target
 StartLimitIntervalSec=300
 StartLimitBurst=3
@@ -9,9 +9,9 @@ WorkingDirectory=/home/ubuntu/moonstream/crawlers/mooncrawl
 EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
 Restart=on-failure
 RestartSec=15s
-ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.moonworm_crawler.cli --access-id "${NB_CONTROLLER_ACCESS_ID}" crawl -b xai_testnet --confirmations 10 --min-blocks-batch 20
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.moonworm_crawler.cli --access-id "${NB_CONTROLLER_ACCESS_ID}" crawl -b xai_sepolia --confirmations 10 --min-blocks-batch 20
 CPUWeight=70
-SyslogIdentifier=xai-test-moonworm-crawler
+SyslogIdentifier=xai-sepolia-moonworm-crawler
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file
diff --git a/crawlers/deploy/xai-testnet-synchronize.service b/crawlers/deploy/xai-sepolia-synchronize.service
similarity index 69%
rename from crawlers/deploy/xai-testnet-synchronize.service
rename to crawlers/deploy/xai-sepolia-synchronize.service
index 6629730e..b6f41d31 100644
--- a/crawlers/deploy/xai-testnet-synchronize.service
+++ b/crawlers/deploy/xai-sepolia-synchronize.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Xai testnet block with transactions synchronizer
+Description=Xai sepolia block with transactions synchronizer
 StartLimitIntervalSec=300
 StartLimitBurst=3
 After=network.target
@@ -9,9 +9,9 @@ Restart=on-failure
 RestartSec=15s
 WorkingDirectory=/home/ubuntu/moonstream/crawlers/mooncrawl
 EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
-ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.crawler --access-id "${NB_CONTROLLER_ACCESS_ID}" blocks synchronize --blockchain xai_testnet -c 10 -j 2
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.crawler --access-id "${NB_CONTROLLER_ACCESS_ID}" blocks synchronize --blockchain xai_sepolia -c 10 -j 2
 CPUWeight=90
-SyslogIdentifier=xai-testnet-synchronize
+SyslogIdentifier=xai-sepolia-synchronize
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file
diff --git a/crawlers/mooncrawl/mooncrawl/blockchain.py b/crawlers/mooncrawl/mooncrawl/blockchain.py
index bd7876ac..d37ba558 100644
--- a/crawlers/mooncrawl/mooncrawl/blockchain.py
+++ b/crawlers/mooncrawl/mooncrawl/blockchain.py
@@ -29,7 +29,7 @@ from .settings import (
     MOONSTREAM_POLYGON_WEB3_PROVIDER_URI,
     MOONSTREAM_WYRM_WEB3_PROVIDER_URI,
     MOONSTREAM_XAI_WEB3_PROVIDER_URI,
-    MOONSTREAM_XAI_TESTNET_WEB3_PROVIDER_URI,
+    MOONSTREAM_XAI_SEPOLIA_WEB3_PROVIDER_URI,
     MOONSTREAM_XDAI_WEB3_PROVIDER_URI,
     MOONSTREAM_ZKSYNC_ERA_TESTNET_WEB3_PROVIDER_URI,
     MOONSTREAM_ZKSYNC_ERA_WEB3_PROVIDER_URI,
@@ -85,8 +85,8 @@ def connect(
             web3_uri = MOONSTREAM_ARBITRUM_SEPOLIA_WEB3_PROVIDER_URI
         elif blockchain_type == AvailableBlockchainType.XAI:
             web3_uri = MOONSTREAM_XAI_WEB3_PROVIDER_URI
-        elif blockchain_type == AvailableBlockchainType.XAI_TESTNET:
-            web3_uri = MOONSTREAM_XAI_TESTNET_WEB3_PROVIDER_URI
+        elif blockchain_type == AvailableBlockchainType.XAI_SEPOLIA:
+            web3_uri = MOONSTREAM_XAI_SEPOLIA_WEB3_PROVIDER_URI
         else:
             raise Exception("Wrong blockchain type provided for web3 URI")
 
@@ -188,7 +188,7 @@ def add_block(db_session, block: Any, blockchain_type: AvailableBlockchainType)
         block_obj.send_root = block.get("sendRoot", "")
         block_obj.mix_hash = block.get("mixHash", "")
 
-    if blockchain_type == AvailableBlockchainType.XAI_TESTNET:
+    if blockchain_type == AvailableBlockchainType.XAI_SEPOLIA:
         block_obj.sha3_uncles = block.get("sha3Uncles", "")
         block_obj.l1_block_number = hex_to_int(block.get("l1BlockNumber"))
         block_obj.send_count = hex_to_int(block.get("sendCount"))
@@ -246,7 +246,7 @@ def add_block_transactions(
         if blockchain_type == AvailableBlockchainType.XAI:
             tx_obj.y_parity = hex_to_int(tx.get("yParity"))
 
-        if blockchain_type == AvailableBlockchainType.XAI_TESTNET:
+        if blockchain_type == AvailableBlockchainType.XAI_SEPOLIA:
             tx_obj.y_parity = hex_to_int(tx.get("yParity"))
 
         db_session.add(tx_obj)
diff --git a/crawlers/mooncrawl/mooncrawl/moonworm_crawler/continuous_crawler.py b/crawlers/mooncrawl/mooncrawl/moonworm_crawler/continuous_crawler.py
index b80f299e..aa930375 100644
--- a/crawlers/mooncrawl/mooncrawl/moonworm_crawler/continuous_crawler.py
+++ b/crawlers/mooncrawl/mooncrawl/moonworm_crawler/continuous_crawler.py
@@ -140,8 +140,8 @@ def continuous_crawler(
         network = Network.arbitrum_sepolia
     elif blockchain_type == AvailableBlockchainType.XAI:
         network = Network.xai
-    elif blockchain_type == AvailableBlockchainType.XAI_TESTNET:
-        network = Network.xai_testnet
+    elif blockchain_type == AvailableBlockchainType.XAI_SEPOLIA:
+        network = Network.xai_sepolia
     else:
         raise ValueError(f"Unknown blockchain type: {blockchain_type}")
 
diff --git a/crawlers/mooncrawl/mooncrawl/moonworm_crawler/crawler.py b/crawlers/mooncrawl/mooncrawl/moonworm_crawler/crawler.py
index 640b9211..a8d8ccd8 100644
--- a/crawlers/mooncrawl/mooncrawl/moonworm_crawler/crawler.py
+++ b/crawlers/mooncrawl/mooncrawl/moonworm_crawler/crawler.py
@@ -40,7 +40,7 @@ class SubscriptionTypes(Enum):
     ARBITRUM_NOVA_BLOCKCHAIN = "arbitrum_nova_smartcontract"
     ARBITRUM_SEPOLIA_BLOCKCHAIN = "arbitrum_sepolia_smartcontract"
     XAI_BLOCKCHAIN = "xai_smartcontract"
-    XAI_TESTNET_BLOCKCHAIN = "xai_testnet_smartcontract"
+    XAI_SEPOLIA_BLOCKCHAIN = "xai_testnet_smartcontract"
 
 
 def abi_input_signature(input_abi: Dict[str, Any]) -> str:
@@ -155,7 +155,7 @@ def blockchain_type_to_subscription_type(
         return SubscriptionTypes.ARBITRUM_SEPOLIA_BLOCKCHAIN
     elif blockchain_type == AvailableBlockchainType.XAI:
         return SubscriptionTypes.XAI_BLOCKCHAIN
-    elif blockchain_type == AvailableBlockchainType.XAI_TESTNET:
+    elif blockchain_type == AvailableBlockchainType.XAI_SEPOLIA:
         return SubscriptionTypes.XAI_TESTNET_BLOCKCHAIN
     else:
         raise ValueError(f"Unknown blockchain type: {blockchain_type}")
diff --git a/crawlers/mooncrawl/mooncrawl/moonworm_crawler/function_call_crawler.py b/crawlers/mooncrawl/mooncrawl/moonworm_crawler/function_call_crawler.py
index 14bdd33e..3ef05095 100644
--- a/crawlers/mooncrawl/mooncrawl/moonworm_crawler/function_call_crawler.py
+++ b/crawlers/mooncrawl/mooncrawl/moonworm_crawler/function_call_crawler.py
@@ -78,8 +78,8 @@ def function_call_crawler(
         network = Network.arbitrum_sepolia
     elif blockchain_type == AvailableBlockchainType.XAI:
         network = Network.xai
-    elif blockchain_type == AvailableBlockchainType.XAI_TESTNET:
-        network = Network.xai_testnet
+    elif blockchain_type == AvailableBlockchainType.XAI_SEPOLIA:
+        network = Network.xai_sepolia
     else:
         raise ValueError(f"Unknown blockchain type: {blockchain_type}")
 
diff --git a/crawlers/mooncrawl/mooncrawl/moonworm_crawler/historical_crawler.py b/crawlers/mooncrawl/mooncrawl/moonworm_crawler/historical_crawler.py
index 4a91f9fe..17097189 100644
--- a/crawlers/mooncrawl/mooncrawl/moonworm_crawler/historical_crawler.py
+++ b/crawlers/mooncrawl/mooncrawl/moonworm_crawler/historical_crawler.py
@@ -71,8 +71,8 @@ def historical_crawler(
         network = Network.arbitrum_sepolia
     elif blockchain_type == AvailableBlockchainType.XAI:
         network = Network.xai
-    elif blockchain_type == AvailableBlockchainType.XAI_TESTNET:
-        network = Network.xai_testnet
+    elif blockchain_type == AvailableBlockchainType.XAI_SEPOLIA:
+        network = Network.xai_sepolia
     else:
         raise Exception("Unsupported blockchain type provided")
 
diff --git a/crawlers/mooncrawl/mooncrawl/settings.py b/crawlers/mooncrawl/mooncrawl/settings.py
index c5dccdd5..25f6f0e9 100644
--- a/crawlers/mooncrawl/mooncrawl/settings.py
+++ b/crawlers/mooncrawl/mooncrawl/settings.py
@@ -144,11 +144,11 @@ MOONSTREAM_XAI_WEB3_PROVIDER_URI = os.environ.get(
 if MOONSTREAM_XAI_WEB3_PROVIDER_URI == "":
     raise Exception("MOONSTREAM_XAI_WEB3_PROVIDER_URI env variable is not set")
 
-MOONSTREAM_XAI_TESTNET_WEB3_PROVIDER_URI = os.environ.get(
-    "MOONSTREAM_XAI_TESTNET_WEB3_PROVIDER_URI", ""
+MOONSTREAM_XAI_SEPOLIA_WEB3_PROVIDER_URI = os.environ.get(
+    "MOONSTREAM_XAI_SEPOLIA_WEB3_PROVIDER_URI", ""
 )
-if MOONSTREAM_XAI_TESTNET_WEB3_PROVIDER_URI == "":
-    raise Exception("MOONSTREAM_XAI_TESTNET_WEB3_PROVIDER_URI env variable is not set")
+if MOONSTREAM_XAI_SEPOLIA_WEB3_PROVIDER_URI == "":
+    raise Exception("MOONSTREAM_XAI_SEPOLIA_WEB3_PROVIDER_URI env variable is not set")
 
 MOONSTREAM_CRAWL_WORKERS = 4
 MOONSTREAM_CRAWL_WORKERS_RAW = os.environ.get("MOONSTREAM_CRAWL_WORKERS")
diff --git a/crawlers/mooncrawl/mooncrawl/stats_worker/dashboard.py b/crawlers/mooncrawl/mooncrawl/stats_worker/dashboard.py
index 52ab496a..a0ea8805 100644
--- a/crawlers/mooncrawl/mooncrawl/stats_worker/dashboard.py
+++ b/crawlers/mooncrawl/mooncrawl/stats_worker/dashboard.py
@@ -59,7 +59,7 @@ subscription_id_by_blockchain = {
     "arbitrum_nova": "arbitrum_nova_smartcontract",
     "arbitrum_sepolia": "arbitrum_sepolia_smartcontract",
     "xai": "xai_smartcontract",
-    "xai_testnet": "xai_testnet_smartcontract",
+    "xai_sepolia": "xai_sepolia_smartcontract",
 }
 
 blockchain_by_subscription_id = {
@@ -72,7 +72,7 @@ blockchain_by_subscription_id = {
     "arbitrum_nova_blockchain": "arbitrum_nova",
     "arbitrum_sepolia_blockchain": "arbitrum_sepolia",
     "xai_blockchain": "xai",
-    "xai_testnet_blockchain": "xai_testnet",
+    "xai_sepolia_blockchain": "xai_sepolia",
     "ethereum_smartcontract": "ethereum",
     "polygon_smartcontract": "polygon",
     "mumbai_smartcontract": "mumbai",
@@ -83,7 +83,7 @@ blockchain_by_subscription_id = {
     "arbitrum_nova_smartcontract": "arbitrum_nova",
     "arbitrum_sepolia_smartcontract": "arbitrum_sepolia",
     "xai_smartcontract": "xai",
-    "xai_testnet_smartcontract": "xai_testnet",
+    "xai_sepolia_smartcontract": "xai_sepolia",
 }
 
 
diff --git a/moonstreamdb/moonstreamdb/blockchain.py b/moonstreamdb/moonstreamdb/blockchain.py
index 78c3871f..3f8cbac4 100644
--- a/moonstreamdb/moonstreamdb/blockchain.py
+++ b/moonstreamdb/moonstreamdb/blockchain.py
@@ -32,9 +32,9 @@ from .models import (
     XaiBlock,
     XaiLabel,
     XaiTransaction,
-    XaiTestnetBlock,
-    XaiTestnetLabel,
-    XaiTestnetTransaction,
+    XaiSepoliaBlock,
+    XaiSepoliaLabel,
+    XaiSepoliaTransaction,
 )
 
 
@@ -49,7 +49,7 @@ class AvailableBlockchainType(Enum):
     ARBITRUM_NOVA = "arbitrum_nova"
     ARBITRUM_SEPOLIA = "arbitrum_sepolia"
     XAI = "xai"
-    XAI_TESTNET = "xai_testnet"
+    XAI_SEPOLIA = "xai_testnet"
 
 
 def get_block_model(
@@ -66,11 +66,11 @@ def get_block_model(
         ArbitrumNovaBlock,
         ArbitrumSepoliaBlock,
         XaiBlock,
-        XaiTestnetBlock,
+        XaiSepoliaBlock,
     ]
 ]:
     """
-    Depends on provided blockchain type: Ethereum, Polygon, Mumbai, XDai, Wyrm, ZkSyncEra, ZkSyncEraTestnet, ArbitrumNovaBlock, ArbitrumSepoliaBlock, XaiBlock, XaiTestnetBlock
+    Depends on provided blockchain type: Ethereum, Polygon, Mumbai, XDai, Wyrm, ZkSyncEra, ZkSyncEraTestnet, ArbitrumNova, ArbitrumSepolia, Xai, XaiSepolia
     set proper blocks model.
     """
     block_model: Type[
@@ -85,7 +85,7 @@ def get_block_model(
             ArbitrumNovaBlock,
             ArbitrumSepoliaBlock,
             XaiBlock,
-            XaiTestnetBlock,
+            XaiSepoliaBlock,
         ]
     ]
     if blockchain_type == AvailableBlockchainType.ETHEREUM:
@@ -108,8 +108,8 @@ def get_block_model(
         block_model = ArbitrumSepoliaBlock
     elif blockchain_type == AvailableBlockchainType.XAI:
         block_model = XaiBlock
-    elif blockchain_type == AvailableBlockchainType.XAI_TESTNET:
-        block_model = XaiTestnetBlock
+    elif blockchain_type == AvailableBlockchainType.XAI_SEPOLIA:
+        block_model = XaiSepoliaBlock
     else:
         raise Exception("Unsupported blockchain type provided")
 
@@ -130,11 +130,11 @@ def get_label_model(
         ArbitrumNovaLabel,
         ArbitrumSepoliaLabel,
         XaiLabel,
-        XaiTestnetLabel,
+        XaiSepoliaLabel,
     ]
 ]:
     """
-    Depends on provided blockchain type: Ethereum, Polygon, Mumbai, XDai, Wyrm, ZkSyncEra, ZkSyncEraTestnet, ArbitrumNovaLabel, ArbitrumSepoliaLabel, XaiLabel, XaiTestnetLabel
+    Depends on provided blockchain type: Ethereum, Polygon, Mumbai, XDai, Wyrm, ZkSyncEra, ZkSyncEraTestnet, ArbitrumNova, ArbitrumSepolia, Xai, XaiSepolia
     set proper block label model.
     """
     label_model: Type[
@@ -149,7 +149,7 @@ def get_label_model(
             ArbitrumNovaLabel,
             ArbitrumSepoliaLabel,
             XaiLabel,
-            XaiTestnetLabel,
+            XaiSepoliaLabel,
         ]
     ]
     if blockchain_type == AvailableBlockchainType.ETHEREUM:
@@ -172,8 +172,8 @@ def get_label_model(
         label_model = ArbitrumSepoliaLabel
     elif blockchain_type == AvailableBlockchainType.XAI:
         label_model = XaiLabel
-    elif blockchain_type == AvailableBlockchainType.XAI_TESTNET:
-        label_model = XaiTestnetLabel
+    elif blockchain_type == AvailableBlockchainType.XAI_SEPOLIA:
+        label_model = XaiSepoliaLabel
     else:
         raise Exception("Unsupported blockchain type provided")
 
@@ -194,11 +194,11 @@ def get_transaction_model(
         ArbitrumNovaTransaction,
         ArbitrumSepoliaTransaction,
         XaiTransaction,
-        XaiTestnetTransaction,
+        XaiSepoliaTransaction,
     ]
 ]:
     """
-    Depends on provided blockchain type: Ethereum, Polygon, Mumbai, XDai, Wyrm, ZkSyncEra, ZkSyncEraTestnet, ArbitrumNovaTransaction, ArbitrumSepoliaTransaction, XaiTransaction, XaiTestnetTransaction
+    Depends on provided blockchain type: Ethereum, Polygon, Mumbai, XDai, Wyrm, ZkSyncEra, ZkSyncEraTestnet, ArbitrumNova, ArbitrumSepolia, Xai, XaiSepolia
     set proper block transactions model.
     """
     transaction_model: Type[
@@ -213,7 +213,7 @@ def get_transaction_model(
             ArbitrumNovaTransaction,
             ArbitrumSepoliaTransaction,
             XaiTransaction,
-            XaiTestnetTransaction,
+            XaiSepoliaTransaction,
         ]
     ]
     if blockchain_type == AvailableBlockchainType.ETHEREUM:
@@ -236,8 +236,8 @@ def get_transaction_model(
         transaction_model = ArbitrumSepoliaTransaction
     elif blockchain_type == AvailableBlockchainType.XAI:
         transaction_model = XaiTransaction
-    elif blockchain_type == AvailableBlockchainType.XAI_TESTNET:
-        transaction_model = XaiTestnetTransaction
+    elif blockchain_type == AvailableBlockchainType.XAI_SEPOLIA:
+        transaction_model = XaiSepoliaTransaction
     else:
         raise Exception("Unsupported blockchain type provided")
 
diff --git a/moonstreamdb/moonstreamdb/models.py b/moonstreamdb/moonstreamdb/models.py
index 50ec63e8..3ebd8819 100644
--- a/moonstreamdb/moonstreamdb/models.py
+++ b/moonstreamdb/moonstreamdb/models.py
@@ -1101,8 +1101,8 @@ class XaiLabel(Base):  # type: ignore
     )
 
 
-class XaiTestnetBlock(Base):  # type: ignore
-    __tablename__ = "xai_testnet_blocks"
+class XaiSepoliaBlock(Base):  # type: ignore
+    __tablename__ = "xai_sepolia_blocks"
 
     block_number = Column(
         BigInteger, primary_key=True, unique=True, nullable=False, index=True
@@ -1136,15 +1136,15 @@ class XaiTestnetBlock(Base):  # type: ignore
     mix_hash = Column(VARCHAR(256), nullable=True)
 
 
-class XaiTestnetTransaction(Base):  # type: ignore
-    __tablename__ = "xai_testnet_transactions"
+class XaiSepoliaTransaction(Base):  # type: ignore
+    __tablename__ = "xai_sepolia_transactions"
 
     hash = Column(
         VARCHAR(256), primary_key=True, unique=True, nullable=False, index=True
     )
     block_number = Column(
         BigInteger,
-        ForeignKey("xai_testnet_blocks.block_number", ondelete="CASCADE"),
+        ForeignKey("xai_sepolia_blocks.block_number", ondelete="CASCADE"),
         nullable=False,
         index=True,
     )
@@ -1167,8 +1167,8 @@ class XaiTestnetTransaction(Base):  # type: ignore
     y_parity = Column(BigInteger, nullable=True)
 
 
-class XaiTestnetLabel(Base):  # type: ignore
-    __tablename__ = "xai_testnet_labels"
+class XaiSepoliaLabel(Base):  # type: ignore
+    __tablename__ = "xai_sepolia_labels"
 
     id = Column(
         UUID(as_uuid=True),
diff --git a/moonstreamdb/moonstreamdb/networks.py b/moonstreamdb/moonstreamdb/networks.py
index 3873fbc8..03b3bf5c 100644
--- a/moonstreamdb/moonstreamdb/networks.py
+++ b/moonstreamdb/moonstreamdb/networks.py
@@ -33,9 +33,9 @@ from .models import (
     XaiBlock,
     XaiLabel,
     XaiTransaction,
-    XaiTestnetBlock,
-    XaiTestnetLabel,
-    XaiTestnetTransaction,
+    XaiSepoliaBlock,
+    XaiSepoliaLabel,
+    XaiSepoliaTransaction,
 )
 
 
@@ -50,7 +50,7 @@ class Network(Enum):
     arbitrum_nova = "arbitrum_nova"
     arbitrum_sepolia = "arbitrum_sepolia"
     xai = "xai"
-    xai_testnet = "xai_testnet"
+    xai_sepolia = "xai_sepolia"
 
 
 tx_raw_types = Union[
@@ -64,7 +64,7 @@ tx_raw_types = Union[
     ArbitrumNovaTransaction,
     ArbitrumSepoliaTransaction,
     XaiTransaction,
-    XaiTestnetTransaction,
+    XaiSepoliaTransaction,
 ]
 
 MODELS: Dict[Network, Dict[str, Base]] = {
@@ -118,9 +118,9 @@ MODELS: Dict[Network, Dict[str, Base]] = {
         "labels": XaiLabel,
         "transactions": XaiTransaction,
     },
-    Network.xai_testnet: {
-        "blocks": XaiTestnetBlock,
-        "labels": XaiTestnetLabel,
-        "transactions": XaiTestnetTransaction,
+    Network.xai_sepolia: {
+        "blocks": XaiSepoliaBlock,
+        "labels": XaiSepoliaLabel,
+        "transactions": XaiSepoliaTransaction,
     },
 }