diff --git a/pkg/evpn/evpn.go b/pkg/evpn/evpn.go
index ad9c28ed..3b77cc48 100644
--- a/pkg/evpn/evpn.go
+++ b/pkg/evpn/evpn.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/philippgille/gokv"
 
-	pe "github.com/opiproject/opi-api/network/evpn-gw/v1alpha1/gen/go"
+	pb "github.com/opiproject/opi-api/network/evpn-gw/v1alpha1/gen/go"
 
 	"github.com/opiproject/opi-evpn-bridge/pkg/utils"
 )
@@ -30,14 +30,14 @@ const (
 
 // Server represents the Server object
 type Server struct {
-	pe.UnimplementedVrfServiceServer
-	pe.UnimplementedSviServiceServer
-	pe.UnimplementedLogicalBridgeServiceServer
-	pe.UnimplementedBridgePortServiceServer
-	Bridges    map[string]*pe.LogicalBridge
-	Ports      map[string]*pe.BridgePort
-	Svis       map[string]*pe.Svi
-	Vrfs       map[string]*pe.Vrf
+	pb.UnimplementedVrfServiceServer
+	pb.UnimplementedSviServiceServer
+	pb.UnimplementedLogicalBridgeServiceServer
+	pb.UnimplementedBridgePortServiceServer
+	Bridges    map[string]*pb.LogicalBridge
+	Ports      map[string]*pb.BridgePort
+	Svis       map[string]*pb.Svi
+	Vrfs       map[string]*pb.Vrf
 	Pagination map[string]int
 	nLink      utils.Netlink
 	frr        utils.Frr
@@ -65,10 +65,10 @@ func NewServerWithArgs(nLink utils.Netlink, frr utils.Frr, store gokv.Store) *Se
 		log.Panic("nil for Store is not allowed")
 	}
 	return &Server{
-		Bridges:    make(map[string]*pe.LogicalBridge),
-		Ports:      make(map[string]*pe.BridgePort),
-		Svis:       make(map[string]*pe.Svi),
-		Vrfs:       make(map[string]*pe.Vrf),
+		Bridges:    make(map[string]*pb.LogicalBridge),
+		Ports:      make(map[string]*pb.BridgePort),
+		Svis:       make(map[string]*pb.Svi),
+		Vrfs:       make(map[string]*pb.Vrf),
 		Pagination: make(map[string]int),
 		nLink:      nLink,
 		frr:        frr,
diff --git a/pkg/evpn/evpn_test.go b/pkg/evpn/evpn_test.go
index ee3c70a0..c2b30787 100644
--- a/pkg/evpn/evpn_test.go
+++ b/pkg/evpn/evpn_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/philippgille/gokv"
 	"github.com/philippgille/gokv/gomap"
 
-	pe "github.com/opiproject/opi-api/network/evpn-gw/v1alpha1/gen/go"
+	pb "github.com/opiproject/opi-api/network/evpn-gw/v1alpha1/gen/go"
 
 	"github.com/opiproject/opi-evpn-bridge/pkg/utils"
 )
@@ -27,10 +27,10 @@ func dialer(opi *Server) func(context.Context, string) (net.Conn, error) {
 	listener := bufconn.Listen(1024 * 1024)
 	server := grpc.NewServer()
 
-	pe.RegisterLogicalBridgeServiceServer(server, opi)
-	pe.RegisterBridgePortServiceServer(server, opi)
-	pe.RegisterVrfServiceServer(server, opi)
-	pe.RegisterSviServiceServer(server, opi)
+	pb.RegisterLogicalBridgeServiceServer(server, opi)
+	pb.RegisterBridgePortServiceServer(server, opi)
+	pb.RegisterVrfServiceServer(server, opi)
+	pb.RegisterSviServiceServer(server, opi)
 
 	go func() {
 		if err := server.Serve(listener); err != nil {