diff --git a/libnetwork/drivers.go b/libnetwork/drivers.go
index 68914bbf64..c443955bc8 100644
--- a/libnetwork/drivers.go
+++ b/libnetwork/drivers.go
@@ -36,7 +36,7 @@ func RegisterNetworkType(name string, creatorFn interface{}, creatorArg interfac
 	ctorArg := []reflect.Type{reflect.TypeOf((*string)(nil)), reflect.TypeOf(creatorArg)}
 	ctorRet := []reflect.Type{reflect.TypeOf((*Network)(nil)).Elem(), reflect.TypeOf((*error)(nil)).Elem()}
 	if err := validateFunctionSignature(creatorFn, ctorArg, ctorRet); err != nil {
-		sig := fmt.Sprintf("func (%s) (Network, error)", ctorArg[0].Name)
+		sig := fmt.Sprintf("func (%s) (Network, error)", ctorArg[0].Name())
 		return fmt.Errorf("invalid signature for %q creator function (expected %s)", name, sig)
 	}
 
@@ -81,7 +81,7 @@ func validateFunctionSignature(fn interface{}, params []reflect.Type, returns []
 	// Valid that argument is a function.
 	fnType := reflect.TypeOf(fn)
 	if fnType.Kind() != reflect.Func {
-		return fmt.Errorf("argument is %s, not function", fnType.Name)
+		return fmt.Errorf("argument is %s, not function", fnType.Name())
 	}
 
 	// Vaidate arguments numbers and types.
@@ -90,7 +90,7 @@ func validateFunctionSignature(fn interface{}, params []reflect.Type, returns []
 	}
 	for i, argType := range params {
 		if argType != fnType.In(i) {
-			return fmt.Errorf("argument %d type should be %s, got %s", i, argType.Name, fnType.In(i).Name)
+			return fmt.Errorf("argument %d type should be %s, got %s", i, argType.Name(), fnType.In(i).Name())
 		}
 	}
 
@@ -100,7 +100,7 @@ func validateFunctionSignature(fn interface{}, params []reflect.Type, returns []
 	}
 	for i, retType := range returns {
 		if retType != fnType.Out(i) {
-			return fmt.Errorf("return value %d type should be %s, got %s", i, retType.Name, fnType.Out(i).Name)
+			return fmt.Errorf("return value %d type should be %s, got %s", i, retType.Name(), fnType.Out(i).Name())
 		}
 	}
 
diff --git a/libnetwork/drivers/bridge/setup_ipv4.go b/libnetwork/drivers/bridge/setup_ipv4.go
index d82e76e876..e0a13362f7 100644
--- a/libnetwork/drivers/bridge/setup_ipv4.go
+++ b/libnetwork/drivers/bridge/setup_ipv4.go
@@ -47,7 +47,7 @@ func setupBridgeIPv4(i *bridgeInterface) error {
 	}
 
 	log.Debugf("Creating bridge interface %q with network %s", i.Config.BridgeName, bridgeIPv4)
-	if err := netlink.AddrAdd(i.Link, &netlink.Addr{bridgeIPv4, ""}); err != nil {
+	if err := netlink.AddrAdd(i.Link, &netlink.Addr{IPNet: bridgeIPv4}); err != nil {
 		return fmt.Errorf("Failed to add IPv4 address %s to bridge: %v", bridgeIPv4, err)
 	}
 
diff --git a/libnetwork/drivers/bridge/setup_ipv6.go b/libnetwork/drivers/bridge/setup_ipv6.go
index 997c1dc6e9..f9dcfc9206 100644
--- a/libnetwork/drivers/bridge/setup_ipv6.go
+++ b/libnetwork/drivers/bridge/setup_ipv6.go
@@ -29,7 +29,7 @@ func setupBridgeIPv6(i *bridgeInterface) error {
 		return fmt.Errorf("Unable to enable IPv6 addresses on bridge: %v", err)
 	}
 
-	if err := netlink.AddrAdd(i.Link, &netlink.Addr{bridgeIPv6, ""}); err != nil {
+	if err := netlink.AddrAdd(i.Link, &netlink.Addr{IPNet: bridgeIPv6}); err != nil {
 		return fmt.Errorf("Failed to add IPv6 address %s to bridge: %v", bridgeIPv6, err)
 	}