diff --git a/libnetwork/ipams/builtin/builtin.go b/libnetwork/ipams/builtin/builtin.go
index 7c08bead1f..8356260abe 100644
--- a/libnetwork/ipams/builtin/builtin.go
+++ b/libnetwork/ipams/builtin/builtin.go
@@ -1,8 +1,8 @@
 package builtin
 
 import (
-	"github.com/docker/docker/libnetwork/ipam"
 	"github.com/docker/docker/libnetwork/ipamapi"
+	"github.com/docker/docker/libnetwork/ipams/defaultipam"
 	"github.com/docker/docker/libnetwork/ipamutils"
 )
 
@@ -19,7 +19,7 @@ func registerBuiltin(ic ipamapi.Registerer, addressPools []*ipamutils.NetworkToS
 		}
 	}
 
-	a, err := ipam.NewAllocator(localAddressPools, ipamutils.GetGlobalScopeDefaultNetworks())
+	a, err := defaultipam.NewAllocator(localAddressPools, ipamutils.GetGlobalScopeDefaultNetworks())
 	if err != nil {
 		return err
 	}
diff --git a/libnetwork/ipam/address_space.go b/libnetwork/ipams/defaultipam/address_space.go
similarity index 99%
rename from libnetwork/ipam/address_space.go
rename to libnetwork/ipams/defaultipam/address_space.go
index ac50a995b9..84d6f8be62 100644
--- a/libnetwork/ipam/address_space.go
+++ b/libnetwork/ipams/defaultipam/address_space.go
@@ -1,4 +1,4 @@
-package ipam
+package defaultipam
 
 import (
 	"context"
diff --git a/libnetwork/ipam/allocator.go b/libnetwork/ipams/defaultipam/allocator.go
similarity index 99%
rename from libnetwork/ipam/allocator.go
rename to libnetwork/ipams/defaultipam/allocator.go
index 31df2aa6d0..6dbb01614d 100644
--- a/libnetwork/ipam/allocator.go
+++ b/libnetwork/ipams/defaultipam/allocator.go
@@ -1,4 +1,4 @@
-package ipam
+package defaultipam
 
 import (
 	"context"
diff --git a/libnetwork/ipam/allocator_test.go b/libnetwork/ipams/defaultipam/allocator_test.go
similarity index 99%
rename from libnetwork/ipam/allocator_test.go
rename to libnetwork/ipams/defaultipam/allocator_test.go
index 91dc114932..29e4cc7903 100644
--- a/libnetwork/ipam/allocator_test.go
+++ b/libnetwork/ipams/defaultipam/allocator_test.go
@@ -1,4 +1,4 @@
-package ipam
+package defaultipam
 
 import (
 	"context"
@@ -357,7 +357,7 @@ func TestPoolAllocationReuse(t *testing.T) {
 	// Verify that we don't see any repeat networks even though
 	// we have freed them.
 	seen := map[string]bool{}
-	for i := 0; i < len(allocs); i++ {
+	for range allocs {
 		alloc, err := a.RequestPool(ipamapi.PoolRequest{AddressSpace: localAddressSpace})
 		if err != nil {
 			t.Fatal(err)
diff --git a/libnetwork/ipam/parallel_test.go b/libnetwork/ipams/defaultipam/parallel_test.go
similarity index 99%
rename from libnetwork/ipam/parallel_test.go
rename to libnetwork/ipams/defaultipam/parallel_test.go
index 47e661e4c2..1312e30924 100644
--- a/libnetwork/ipam/parallel_test.go
+++ b/libnetwork/ipams/defaultipam/parallel_test.go
@@ -1,4 +1,4 @@
-package ipam
+package defaultipam
 
 import (
 	"context"
diff --git a/libnetwork/ipam/structures.go b/libnetwork/ipams/defaultipam/structures.go
similarity index 99%
rename from libnetwork/ipam/structures.go
rename to libnetwork/ipams/defaultipam/structures.go
index 3a00d1cef5..37deed6890 100644
--- a/libnetwork/ipam/structures.go
+++ b/libnetwork/ipams/defaultipam/structures.go
@@ -1,4 +1,4 @@
-package ipam
+package defaultipam
 
 import (
 	"fmt"