diff --git a/cmd/zetaclientd/start.go b/cmd/zetaclientd/start.go
index 3db7faa976..ceecc96170 100644
--- a/cmd/zetaclientd/start.go
+++ b/cmd/zetaclientd/start.go
@@ -80,7 +80,7 @@ func start(_ *cobra.Command, _ []string) error {
 
 	// Wait until zetacore is up
 	waitForZetaCore(cfg, startLogger)
-	startLogger.Info().Msgf("ZetaCore is ready , Trying to connect to %s", cfg.Peer)
+	startLogger.Info().Msgf("Zetacore is ready, trying to connect to %s", cfg.Peer)
 
 	telemetryServer := metrics.NewTelemetryServer()
 	go func() {
@@ -128,7 +128,7 @@ func start(_ *cobra.Command, _ []string) error {
 		startLogger.Error().Err(err).Msg("Error getting core parameters")
 		return err
 	}
-	startLogger.Info().Msgf("Config is updated from ZetaCore %s", maskCfg(cfg))
+	startLogger.Info().Msgf("Config is updated from zetacore %s", maskCfg(cfg))
 
 	go zetacoreClient.CoreContextUpdater(appContext)
 
diff --git a/cmd/zetaclientd/start_utils.go b/cmd/zetaclientd/start_utils.go
index e0aa59002e..ed81bc36f4 100644
--- a/cmd/zetaclientd/start_utils.go
+++ b/cmd/zetaclientd/start_utils.go
@@ -15,7 +15,7 @@ import (
 
 func waitForZetaCore(config config.Config, logger zerolog.Logger) {
 	// wait until zetacore is up
-	logger.Debug().Msg("Waiting for ZetaCore to open 9090 port...")
+	logger.Debug().Msg("Waiting for zetacore to open 9090 port...")
 	for {
 		_, err := grpc.Dial(
 			fmt.Sprintf("%s:9090", config.ZetaCoreURL),
diff --git a/e2e/README.md b/e2e/README.md
index f7d43ddf08..d93523b123 100644
--- a/e2e/README.md
+++ b/e2e/README.md
@@ -28,8 +28,8 @@ A config YAML file can be provided to the E2E test tool via the `--config` flag.
 - `Zevm`: RPC endpoint for the ZetaChain EVM.
 - `EVM`: RPC endpoint for the Ethereum network.
 - `Bitcoin`: RPC endpoint for the Bitcoin network.
-- `ZetaCoreGRPC`: GRPC endpoint for ZetaCore.
-- `ZetaCoreRPC`: RPC endpoint for ZetaCore.
+- `ZetaCoreGRPC`: GRPC endpoint for zetacore.
+- `ZetaCoreRPC`: RPC endpoint for zetacore.
 
 ### Contracts Configuration:
 
diff --git a/zetaclient/chains/bitcoin/signer/signer.go b/zetaclient/chains/bitcoin/signer/signer.go
index e471f4bf6e..d09800ed8b 100644
--- a/zetaclient/chains/bitcoin/signer/signer.go
+++ b/zetaclient/chains/bitcoin/signer/signer.go
@@ -416,7 +416,7 @@ func (signer *Signer) TryProcessOutTx(
 			logger.Info().Msgf("Broadcast success: nonce %d to chain %s outTxHash %s", outboundTxTssNonce, chain.String(), outTxHash)
 			zetaHash, err := zetacoreClient.AddTxHashToOutTxTracker(chain.ChainId, outboundTxTssNonce, outTxHash, nil, "", -1)
 			if err != nil {
-				logger.Err(err).Msgf("Unable to add to tracker on ZetaCore: nonce %d chain %s outTxHash %s", outboundTxTssNonce, chain.ChainName, outTxHash)
+				logger.Err(err).Msgf("Unable to add to tracker on zetacore: nonce %d chain %s outTxHash %s", outboundTxTssNonce, chain.ChainName, outTxHash)
 			}
 			logger.Info().Msgf("Broadcast to core successful %s", zetaHash)
 
diff --git a/zetaclient/chains/evm/observer/observer.go b/zetaclient/chains/evm/observer/observer.go
index f273db9b42..d289c8eaa3 100644
--- a/zetaclient/chains/evm/observer/observer.go
+++ b/zetaclient/chains/evm/observer/observer.go
@@ -191,7 +191,7 @@ func (ob *Observer) WithEvmJSONRPC(client interfaces.EVMJSONRPCClient) {
 	ob.evmJSONRPC = client
 }
 
-// WithZetacoreClient attaches a new client to interact with ZetaCore to the observer
+// WithZetacoreClient attaches a new client to interact with zetacore to the observer
 func (ob *Observer) WithZetacoreClient(client interfaces.ZetacoreClient) {
 	ob.Mu.Lock()
 	defer ob.Mu.Unlock()
diff --git a/zetaclient/orchestrator/orchestrator.go b/zetaclient/orchestrator/orchestrator.go
index 78d2599180..6558af21e9 100644
--- a/zetaclient/orchestrator/orchestrator.go
+++ b/zetaclient/orchestrator/orchestrator.go
@@ -238,7 +238,7 @@ func (oc *Orchestrator) StartCctxScheduler(appContext *context.AppContext) {
 				if bn > lastBlockNum { // we have a new block
 					bn = lastBlockNum + 1
 					if bn%10 == 0 {
-						oc.logger.Std.Debug().Msgf("StartCctxScheduler: ZetaCore heart beat: %d", bn)
+						oc.logger.Std.Debug().Msgf("StartCctxScheduler: zetacore heart beat: %d", bn)
 					}
 
 					balance, err := oc.zetacoreClient.GetZetaHotKeyBalance()
diff --git a/zetaclient/zetacore/broadcast.go b/zetaclient/zetacore/broadcast.go
index 32114b0155..d160fdd1c6 100644
--- a/zetaclient/zetacore/broadcast.go
+++ b/zetaclient/zetacore/broadcast.go
@@ -34,7 +34,7 @@ var (
 	// gas price increase due to EIP1559 feemarket on ZetaChain
 	bufferMultiplier = sdktypes.MustNewDecFromStr("1.5")
 
-	// Variable function used by transactions to broadcast a message to ZetaCore. This will create enough flexibility
+	// Variable function used by transactions to broadcast a message to zetacore. This will create enough flexibility
 	// in the implementation to allow for more comprehensive unit testing.
 	zetacoreBroadcast BroadcastInterface = BroadcastToZetaCore
 )
diff --git a/zetaclient/zetacore/client.go b/zetaclient/zetacore/client.go
index de7a4be566..ddf234ed97 100644
--- a/zetaclient/zetacore/client.go
+++ b/zetaclient/zetacore/client.go
@@ -23,7 +23,7 @@ import (
 
 var _ interfaces.ZetacoreClient = &Client{}
 
-// Client is the client to send tx to ZetaCore
+// Client is the client to send tx to zetacore
 type Client struct {
 	logger        zerolog.Logger
 	blockHeight   int64
@@ -168,13 +168,13 @@ func (c *Client) WaitForCoreToCreateBlocks() {
 	for {
 		block, err := c.GetLatestZetaBlock()
 		if err == nil && block.Header.Height > 1 {
-			c.logger.Info().Msgf("Zeta-core height: %d", block.Header.Height)
+			c.logger.Info().Msgf("Zetacore height: %d", block.Header.Height)
 			break
 		}
 		retryCount++
 		c.logger.Debug().Msgf("Failed to get latest Block , Retry : %d/%d", retryCount, DefaultRetryCount)
 		if retryCount > ExtendedRetryCount {
-			panic(fmt.Sprintf("ZetaCore is not ready , Waited for %d seconds", DefaultRetryCount*DefaultRetryInterval))
+			panic(fmt.Sprintf("Zetacore is not ready, waited for %d seconds", DefaultRetryCount*DefaultRetryInterval))
 		}
 		time.Sleep(DefaultRetryInterval * time.Second)
 	}