diff --git a/.github/workflows/utility/generate_assetlist_functions.mjs b/.github/workflows/utility/generate_assetlist_functions.mjs
index f1cc624ef..67dc9cad5 100644
--- a/.github/workflows/utility/generate_assetlist_functions.mjs
+++ b/.github/workflows/utility/generate_assetlist_functions.mjs
@@ -622,7 +622,11 @@ export function setName(asset_data) {
   }
 
   //but use chain name instead if it's the staking token...
-  if (getAssetProperty(asset_data.origin_asset, "is_staking")) {
+  if (
+    !asset_data.zone_asset?.override_properties?.use_asset_name
+      &&
+    getAssetProperty(asset_data.origin_asset, "is_staking")
+  ) {
     name = chain_reg.getFileProperty(asset_data.origin_asset.chain_name, "chain", "pretty_name");
     //Check for Chain Name Override--E.G., "Ethereum Mainnet" -> "Ethereum"
     let override_chain_pretty_name = asset_data.zone_config?.chains?.find(
diff --git a/osmosis-1/generated/asset_detail/assetlist.json b/osmosis-1/generated/asset_detail/assetlist.json
index e21b78209..2de4f12b1 100644
--- a/osmosis-1/generated/asset_detail/assetlist.json
+++ b/osmosis-1/generated/asset_detail/assetlist.json
@@ -2562,14 +2562,14 @@
       "twitterURL": "https://x.com/mars_protocol"
     },
     {
-      "name": "TON (The Open Network) (Oraichain)",
+      "name": "Toncoin (Oraichain Labs TON Bridge)",
       "symbol": "TON.orai",
       "description": "The native token of TON\n\nToincoin has been bridged from The Open Network to Oraichain.",
       "websiteURL": "https://ton.tg/",
       "twitterURL": "https://x.com/ton_blockchain"
     },
     {
-      "name": "TON (The Open Network)",
+      "name": "Toncoin",
       "symbol": "TON",
       "description": "Toncoin ($TON) is the native cryptocurrency of the TON (The Open Network) blockchain.\n\nTON (The Open Network) is a decentralized layer-1 blockchain designed for scalability, speed, and efficiency. It was originally conceived by the creators of Telegram but was later handed over to an open-source community to maintain and expand.",
       "coingeckoID": "the-open-network",
diff --git a/osmosis-1/generated/chain_registry/assetlist.json b/osmosis-1/generated/chain_registry/assetlist.json
index f76efb8f2..9616e3281 100644
--- a/osmosis-1/generated/chain_registry/assetlist.json
+++ b/osmosis-1/generated/chain_registry/assetlist.json
@@ -23158,7 +23158,7 @@
       ],
       "type_asset": "ics20",
       "base": "ibc/905889A7F0B94F1CE1506D9BADF13AE9141E4CBDBCD565E1DFC7AE418B3E3E98",
-      "name": "TON (The Open Network) (Oraichain)",
+      "name": "Toncoin (Oraichain Labs TON Bridge)",
       "display": "ton",
       "symbol": "TON.orai",
       "traces": [
@@ -23223,7 +23223,7 @@
       "type_asset": "sdk.coin",
       "address": "osmo12lnwf54yd30p6amzaged2atln8k0l32n7ncxf04ctg7u7ymnsy7qkqgsw4",
       "base": "factory/osmo12lnwf54yd30p6amzaged2atln8k0l32n7ncxf04ctg7u7ymnsy7qkqgsw4/alloyed/allTON",
-      "name": "TON (The Open Network)",
+      "name": "Toncoin",
       "display": "ton",
       "symbol": "TON",
       "traces": [
diff --git a/osmosis-1/generated/frontend/assetlist.json b/osmosis-1/generated/frontend/assetlist.json
index d76ae9ebb..d9a6f19d0 100644
--- a/osmosis-1/generated/frontend/assetlist.json
+++ b/osmosis-1/generated/frontend/assetlist.json
@@ -24501,7 +24501,7 @@
         }
       ],
       "variantGroupKey": "factory/osmo12lnwf54yd30p6amzaged2atln8k0l32n7ncxf04ctg7u7ymnsy7qkqgsw4/alloyed/allTON",
-      "name": "TON (The Open Network) (Oraichain)",
+      "name": "Toncoin (Oraichain Labs TON Bridge)",
       "isAlloyed": false,
       "verified": true,
       "unstable": false,
@@ -24540,7 +24540,7 @@
         }
       ],
       "variantGroupKey": "factory/osmo12lnwf54yd30p6amzaged2atln8k0l32n7ncxf04ctg7u7ymnsy7qkqgsw4/alloyed/allTON",
-      "name": "TON (The Open Network)",
+      "name": "Toncoin",
       "isAlloyed": true,
       "contract": "osmo12lnwf54yd30p6amzaged2atln8k0l32n7ncxf04ctg7u7ymnsy7qkqgsw4",
       "verified": true,
diff --git a/osmosis-1/osmosis.zone_assets.json b/osmosis-1/osmosis.zone_assets.json
index a81942db6..a2e21c6a4 100644
--- a/osmosis-1/osmosis.zone_assets.json
+++ b/osmosis-1/osmosis.zone_assets.json
@@ -186,7 +186,7 @@
       "path": "transfer/channel-72/uluna",
       "osmosis_verified": true,
       "override_properties": {
-        "name": "Luna Classic"
+        "use_asset_name":  true
       },
       "transfer_methods": [
         {
@@ -5053,6 +5053,7 @@
         "defi"
       ],
       "override_properties": {
+        "use_asset_name": true,
         "logo_URIs": {
           "svg": "https://raw.githubusercontent.com/cosmos/chain-registry/master/osmosis/images/ton.orai.svg",
           "png": "https://raw.githubusercontent.com/cosmos/chain-registry/master/osmosis/images/ton.orai.png"
@@ -5077,6 +5078,9 @@
       "canonical": {
         "chain_name": "ton",
         "base_denom": "nanoton"
+      },
+      "override_properties": {
+        "use_asset_name": true
       }
     }
   ]
diff --git a/osmosis-1/osmosis.zone_config.json b/osmosis-1/osmosis.zone_config.json
index 3970c4671..b03c15650 100644
--- a/osmosis-1/osmosis.zone_config.json
+++ b/osmosis-1/osmosis.zone_config.json
@@ -180,8 +180,9 @@
       },
       {
         "provider": "Oraichain Labs TON Bridge",
-        "name_suffix": "",
-        "symbol_suffix": ""
+        "name_suffix": "Oraichain Labs TON Bridge",
+        "symbol_suffix": ".orai",
+        "destination_network": "oraichain"
       }
     ],
     "evm_chains": [