diff --git a/consul/client.go b/consul/client.go
index 8d59151176..89aaf438af 100644
--- a/consul/client.go
+++ b/consul/client.go
@@ -182,7 +182,7 @@ func (c *Client) setupSerf(conf *serf.Config, ch chan serf.Event, path string) (
 	conf.Merge = &lanMergeDelegate{dc: c.config.Datacenter}
 	conf.DisableCoordinates = c.config.DisableCoordinates
 	if wanAddr := c.config.SerfWANConfig.MemberlistConfig.AdvertiseAddr; wanAddr != "" {
-		conf.Tags["WanAddr"] = wanAddr
+		conf.Tags["wan_addr"] = wanAddr
 	}
 	if err := ensurePath(conf.SnapshotPath, false); err != nil {
 		return nil, err
diff --git a/consul/leader.go b/consul/leader.go
index 8987120eb6..8f811ddeeb 100644
--- a/consul/leader.go
+++ b/consul/leader.go
@@ -381,7 +381,7 @@ func (s *Server) handleAliveMember(member serf.Member) error {
 	}
 	if node != nil && node.Address == member.Addr.String() {
 		// Check if the WAN address was updated
-		if node.WanAddress != member.Tags["WanAddr"] {
+		if node.WanAddress != member.Tags["wan_addr"] {
 			goto AFTER_CHECK
 		}
 
@@ -423,7 +423,7 @@ AFTER_CHECK:
 		Datacenter: s.config.Datacenter,
 		Node:       member.Name,
 		Address:    member.Addr.String(),
-		WanAddress: member.Tags["WanAddr"],
+		WanAddress: member.Tags["wan_addr"],
 		Service:    service,
 		Check: &structs.HealthCheck{
 			Node:    member.Name,
@@ -466,7 +466,7 @@ func (s *Server) handleFailedMember(member serf.Member) error {
 		Datacenter: s.config.Datacenter,
 		Node:       member.Name,
 		Address:    member.Addr.String(),
-		WanAddress: member.Tags["WanAddr"],
+		WanAddress: member.Tags["wan_addr"],
 		Check: &structs.HealthCheck{
 			Node:    member.Name,
 			CheckID: SerfCheckID,
diff --git a/consul/server.go b/consul/server.go
index 5f15975c7c..36371e60f3 100644
--- a/consul/server.go
+++ b/consul/server.go
@@ -300,7 +300,7 @@ func (s *Server) setupSerf(conf *serf.Config, ch chan serf.Event, path string, w
 		conf.Tags["expect"] = fmt.Sprintf("%d", s.config.BootstrapExpect)
 	}
 	if wanAddr := s.config.SerfWANConfig.MemberlistConfig.AdvertiseAddr; wanAddr != "" {
-		conf.Tags["WanAddr"] = wanAddr
+		conf.Tags["wan_addr"] = wanAddr
 	}
 	conf.MemberlistConfig.LogOutput = s.config.LogOutput
 	conf.LogOutput = s.config.LogOutput