diff --git a/protocols/bgp/server/bmp_router.go b/protocols/bgp/server/bmp_router.go
index d2883033ffe44d244124411c33a6263b44a6c7e5..6749368b29df9694642dbbf7d17c089a9dcfa4eb 100644
--- a/protocols/bgp/server/bmp_router.go
+++ b/protocols/bgp/server/bmp_router.go
@@ -35,12 +35,12 @@ type router struct {
 }
 
 type neighbor struct {
-	localAS  uint32
-	peerAS   uint32
-	address  [16]byte
-	routerID uint32
-	fsm      *FSM
-	opt      *packet.DecodeOptions
+	localAS     uint32
+	peerAS      uint32
+	peerAddress [16]byte
+	routerID    uint32
+	fsm         *FSM
+	opt         *packet.DecodeOptions
 }
 
 func newRouter(addr net.IP, port uint16, rib4 *locRIB.LocRIB, rib6 *locRIB.LocRIB) *router {
@@ -275,12 +275,12 @@ func (r *router) processPeerUpNotification(msg *bmppkt.PeerUpNotification) error
 
 	fsm.state = newEstablishedState(fsm)
 	n := &neighbor{
-		localAS:  fsm.peer.localASN,
-		peerAS:   msg.PerPeerHeader.PeerAS,
-		address:  msg.PerPeerHeader.PeerAddress,
-		routerID: recvOpen.BGPIdentifier,
-		fsm:      fsm,
-		opt:      fsm.decodeOptions(),
+		localAS:     fsm.peer.localASN,
+		peerAS:      msg.PerPeerHeader.PeerAS,
+		peerAddress: msg.PerPeerHeader.PeerAddress,
+		routerID:    recvOpen.BGPIdentifier,
+		fsm:         fsm,
+		opt:         fsm.decodeOptions(),
 	}
 
 	r.neighbors[msg.PerPeerHeader.PeerAddress] = n
diff --git a/protocols/bgp/server/bmp_router_test.go b/protocols/bgp/server/bmp_router_test.go
index c67ca1846af6ae01ca1007c118264400e0be049f..a25d419b58fe89bbe2a0c7c7e7dbc3b41424cb84 100644
--- a/protocols/bgp/server/bmp_router_test.go
+++ b/protocols/bgp/server/bmp_router_test.go
@@ -302,10 +302,10 @@ func TestProcessPeerUpNotification(t *testing.T) {
 				rib6: locRIB.New(),
 				neighbors: map[[16]byte]*neighbor{
 					[16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 255, 1}: {
-						localAS:  200,
-						peerAS:   100,
-						address:  [16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 255, 1},
-						routerID: 169090610,
+						localAS:     200,
+						peerAS:      100,
+						peerAddress: [16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 255, 1},
+						routerID:    169090610,
 						opt: &packet.DecodeOptions{
 							AddPath:     false,
 							Use32BitASN: false,