diff --git a/README.md b/README.md
index ac8a946b..a45a3e76 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ To run Helios on an OP Stack chain, run the command below, replacing `$ETH_RPC_U
 helios opstack --network $NETWORK --execution-rpc $ETH_RPC_URL
 ```
 
-Currently supported network values are `optimism` and `base`, with more to come soon.
+Currently supported network values are `op-mainnet` and `base`, with more to come soon.
 
 ### Additional Ethereum CLI Options <a id="additional-cli-options"></a>
 
@@ -85,7 +85,7 @@ consensus_rpc = "https://ethereum.operationsolarstorm.org"
 execution_rpc = "https://eth-mainnet.g.alchemy.com/v2/XXXXX"
 checkpoint = "0x85e6151a246e8fdba36db27a0c7678a575346272fe978c9281e13a8b26cdfa68"
 
-[optimism]
+[op-mainnet]
 consensus_rpc = "https://optimism.operationsolarstorm.org"
 execution_rpc = "https://opt-mainnet.g.alchemy.com/v2/XXXXX"
 
diff --git a/helios-ts/index.html b/helios-ts/index.html
index 425b39c5..1764a2ac 100644
--- a/helios-ts/index.html
+++ b/helios-ts/index.html
@@ -96,7 +96,7 @@ <h2>Ethereum</h2>
       </div>
     </div>
     <div class="panel" id="optimism-panel">
-      <h2>Optimism</h2>
+      <h2>OP Mainnet</h2>
       <div class="blocks" id="optimism-blocks">
         <pre class="block-info syncing" id="optimism-syncing">Syncing...</pre>
       </div>
@@ -126,12 +126,12 @@ <h2>Base</h2>
       
       let configOptimsim = {
         executionRpc: "https://opt-mainnet.g.alchemy.com/v2/" + alcehmyKey,
-        network: "optimism",
+        network: "op-mainnet",
       };
 
-      let optimismProvider = new helios.HeliosProvider(configOptimsim, "opstack");
-      optimismProvider .sync().then(() => {
-        window.heliosOptimism = new ethers.providers.Web3Provider(optimismProvider);
+      let opMainnetProvider = new helios.HeliosProvider(configOptimsim, "opstack");
+      opMainnetProvider .sync().then(() => {
+        window.heliosOpMainnet = new ethers.providers.Web3Provider(opMainnetProvider);
       });
 
       let configBase = {
@@ -191,7 +191,7 @@ <h2>Base</h2>
       }
 
       setInterval(async () => updateBlockInfo(window.heliosEthereum, "ethereum"), 1000);
-      setInterval(async () => updateBlockInfo(window.heliosOptimism, "optimism"), 1000);
+      setInterval(async () => updateBlockInfo(window.heliosOpMainnet, "op-mainnet"), 1000);
       setInterval(async () => updateBlockInfo(window.heliosBase, "base"), 1000);
     });
   </script>
diff --git a/helios-ts/src/opstack.rs b/helios-ts/src/opstack.rs
index 47fe946b..4c1f56f5 100644
--- a/helios-ts/src/opstack.rs
+++ b/helios-ts/src/opstack.rs
@@ -26,7 +26,7 @@ impl OpStackClient {
         console_error_panic_hook::set_once();
 
         let network_config = match network.as_str() {
-            "optimism" => NetworkConfig::from(Network::Optimism),
+            "op-mainnet" => NetworkConfig::from(Network::OpMainnet),
             "base" => NetworkConfig::from(Network::Base),
             "worldchain" => NetworkConfig::from(Network::Worldchain),
             "zora" => NetworkConfig::from(Network::Zora),
diff --git a/opstack/src/config.rs b/opstack/src/config.rs
index 547b33f0..ef15347d 100644
--- a/opstack/src/config.rs
+++ b/opstack/src/config.rs
@@ -34,7 +34,7 @@ pub struct NetworkConfig {
 
 #[derive(Copy, Clone, Debug)]
 pub enum Network {
-    Optimism,
+    OpMainnet,
     Base,
     Worldchain,
     Zora,
@@ -43,7 +43,7 @@ pub enum Network {
 impl Display for Network {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Self::Optimism => f.write_str("optimism"),
+            Self::OpMainnet => f.write_str("op-mainnet"),
             Self::Base => f.write_str("base"),
             Self::Worldchain => f.write_str("worldchain"),
             Self::Zora => f.write_str("zora"),
@@ -56,7 +56,7 @@ impl FromStr for Network {
 
     fn from_str(s: &str) -> Result<Self> {
         match s {
-            "optimism" => Ok(Self::Optimism),
+            "op-mainnet" => Ok(Self::OpMainnet),
             "base" => Ok(Self::Base),
             "worldchain" => Ok(Self::Worldchain),
             "zora" => Ok(Self::Zora),
@@ -68,7 +68,7 @@ impl FromStr for Network {
 impl From<Network> for NetworkConfig {
     fn from(value: Network) -> Self {
         match value {
-            Network::Optimism => NetworkConfig {
+            Network::OpMainnet => NetworkConfig {
                 consensus_rpc: Some("https://optimism.operationsolarstorm.org".parse().unwrap()),
                 chain: ChainConfig {
                     chain_id: 10,
diff --git a/opstack/src/server/net/bootnodes.rs b/opstack/src/server/net/bootnodes.rs
index 59e13284..598d2ffe 100644
--- a/opstack/src/server/net/bootnodes.rs
+++ b/opstack/src/server/net/bootnodes.rs
@@ -2,7 +2,7 @@ use std::str::FromStr;
 
 use discv5::enr::{CombinedKey, Enr};
 
-/// Default bootnodes to use. Currently consists of 2 Base bootnodes & 1 Optimism bootnode.
+/// Default bootnodes to use. Currently consists of 2 Base bootnodes & 1 Op Mainnet bootnode.
 pub fn bootnodes() -> Vec<Enr<CombinedKey>> {
     let bootnodes = [
         "enr:-J64QBbwPjPLZ6IOOToOLsSjtFUjjzN66qmBZdUexpO32Klrc458Q24kbty2PdRaLacHM5z-cZQr8mjeQu3pik6jPSOGAYYFIqBfgmlkgnY0gmlwhDaRWFWHb3BzdGFja4SzlAUAiXNlY3AyNTZrMaECmeSnJh7zjKrDSPoNMGXoopeDF4hhpj5I0OsQUUt4u8uDdGNwgiQGg3VkcIIkBg",