diff --git a/node/status_node_services.go b/node/status_node_services.go
index d29354a2d..c8edf439b 100644
--- a/node/status_node_services.go
+++ b/node/status_node_services.go
@@ -330,7 +330,7 @@ func (b *StatusNode) wakuV2Service(nodeConfig *params.NodeConfig, telemetryServe
 			DefaultShardPubsubTopic: shard.DefaultShardPubsubTopic(),
 			UseShardAsDefaultTopic:  nodeConfig.WakuV2Config.UseShardAsDefaultTopic,
 			TelemetryServerURL:      telemetryServerURL,
-			ClusterId:               nodeConfig.ClusterConfig.ClusterID,
+			ClusterID:               nodeConfig.ClusterConfig.ClusterID,
 		}
 
 		if nodeConfig.WakuV2Config.MaxMessageSize > 0 {
diff --git a/wakuv2/config.go b/wakuv2/config.go
index f4484915d..4f2fd3fcc 100644
--- a/wakuv2/config.go
+++ b/wakuv2/config.go
@@ -48,7 +48,7 @@ type Config struct {
 	EnableFilterFullNode    bool     `toml:",omitempty"`
 	DefaultShardPubsubTopic string   `toml:",omitempty"`
 	UseShardAsDefaultTopic  bool     `toml:",omitempty"`
-	ClusterId               uint16   `toml:",omitempty"`
+	ClusterID               uint16   `toml:",omitempty"`
 }
 
 var DefaultConfig = Config{
diff --git a/wakuv2/waku.go b/wakuv2/waku.go
index 696ab3653..ba41b3419 100644
--- a/wakuv2/waku.go
+++ b/wakuv2/waku.go
@@ -285,7 +285,7 @@ func New(nodeKey string, fleet string, cfg *Config, logger *zap.Logger, appDB *s
 		node.WithKeepAlive(time.Duration(cfg.KeepAliveInterval) * time.Second),
 		node.WithMaxPeerConnections(cfg.DiscoveryLimit),
 		node.WithLogger(logger),
-		node.WithClusterID(cfg.ClusterId),
+		node.WithClusterID(cfg.ClusterID),
 	}
 
 	if cfg.EnableDiscV5 {