diff --git a/libnetwork/agent.go b/libnetwork/agent.go
index f1b6ae8264..e7e673f5ec 100644
--- a/libnetwork/agent.go
+++ b/libnetwork/agent.go
@@ -35,7 +35,7 @@ func (b ByTime) Len() int           { return len(b) }
 func (b ByTime) Swap(i, j int)      { b[i], b[j] = b[j], b[i] }
 func (b ByTime) Less(i, j int) bool { return b[i].LamportTime < b[j].LamportTime }
 
-type agent struct {
+type nwAgent struct {
 	networkDB         *networkdb.NetworkDB
 	bindAddr          string
 	advertiseAddr     string
@@ -45,7 +45,7 @@ type agent struct {
 	sync.Mutex
 }
 
-func (a *agent) dataPathAddress() string {
+func (a *nwAgent) dataPathAddress() string {
 	a.Lock()
 	defer a.Unlock()
 	if a.dataPathAddr != "" {
@@ -323,7 +323,7 @@ func (c *Controller) agentInit(listenAddr, bindAddrOrInterface, advertiseAddr, d
 	cancelList = append(cancelList, cancel)
 
 	c.mu.Lock()
-	c.agent = &agent{
+	c.agent = &nwAgent{
 		networkDB:         nDB,
 		bindAddr:          bindAddr,
 		advertiseAddr:     advertiseAddr,
@@ -750,7 +750,7 @@ func (ep *Endpoint) deleteServiceInfoFromCluster(sb *Sandbox, fullRemove bool, m
 	return nil
 }
 
-func disableServiceInNetworkDB(a *agent, n *Network, ep *Endpoint) {
+func disableServiceInNetworkDB(a *nwAgent, n *Network, ep *Endpoint) {
 	var epRec EndpointRecord
 
 	log.G(context.TODO()).Debugf("disableServiceInNetworkDB for %s %s", ep.svcName, ep.ID())
diff --git a/libnetwork/controller.go b/libnetwork/controller.go
index 331c7f8e1b..b3b782f4d4 100644
--- a/libnetwork/controller.go
+++ b/libnetwork/controller.go
@@ -101,7 +101,7 @@ type Controller struct {
 	defOsSbox        osl.Sandbox
 	ingressSandbox   *Sandbox
 	sboxOnce         sync.Once
-	agent            *agent
+	agent            *nwAgent
 	networkLocker    *locker.Locker
 	agentInitDone    chan struct{}
 	agentStopDone    chan struct{}
@@ -213,7 +213,7 @@ func (c *Controller) SetKeys(keys []*types.EncryptionKey) error {
 	return c.handleKeyChange(keys)
 }
 
-func (c *Controller) getAgent() *agent {
+func (c *Controller) getAgent() *nwAgent {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 	return c.agent