@@ -6,11 +6,11 @@ import (

 	"time"

 	"github.com/docker/docker/api/types"

-	"github.com/docker/docker/api/types/container"

+	containertypes "github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/api/types/events"

 	"github.com/docker/docker/api/types/filters"

 	"github.com/docker/docker/api/types/image"

-	"github.com/docker/docker/api/types/network"

+	networktypes "github.com/docker/docker/api/types/network"

 	"github.com/docker/docker/api/types/registry"

 	"github.com/docker/docker/api/types/swarm"

 	volumetypes "github.com/docker/docker/api/types/volume"

@@ -43,8 +43,8 @@ type CommonAPIClient interface {

 type ContainerAPIClient interface {

 	ContainerAttach(ctx context.Context, container string, options types.ContainerAttachOptions) (types.HijackedResponse, error)

 	ContainerCommit(ctx context.Context, container string, options types.ContainerCommitOptions) (types.IDResponse, error)

-	ContainerCreate(ctx context.Context, config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig, containerName string) (container.ContainerCreateCreatedBody, error)

-	ContainerDiff(ctx context.Context, container string) ([]container.ContainerChangeResponseItem, error)

+	ContainerCreate(ctx context.Context, config *containertypes.Config, hostConfig *containertypes.HostConfig, networkingConfig *networktypes.NetworkingConfig, containerName string) (containertypes.ContainerCreateCreatedBody, error)

+	ContainerDiff(ctx context.Context, container string) ([]containertypes.ContainerChangeResponseItem, error)

 	ContainerExecAttach(ctx context.Context, execID string, config types.ExecStartCheck) (types.HijackedResponse, error)

 	ContainerExecCreate(ctx context.Context, container string, config types.ExecConfig) (types.IDResponse, error)

 	ContainerExecInspect(ctx context.Context, execID string) (types.ContainerExecInspect, error)

@@ -65,10 +65,10 @@ type ContainerAPIClient interface {

 	ContainerStats(ctx context.Context, container string, stream bool) (types.ContainerStats, error)

 	ContainerStart(ctx context.Context, container string, options types.ContainerStartOptions) error

 	ContainerStop(ctx context.Context, container string, timeout *time.Duration) error

-	ContainerTop(ctx context.Context, container string, arguments []string) (container.ContainerTopOKBody, error)

+	ContainerTop(ctx context.Context, container string, arguments []string) (containertypes.ContainerTopOKBody, error)

 	ContainerUnpause(ctx context.Context, container string) error

-	ContainerUpdate(ctx context.Context, container string, updateConfig container.UpdateConfig) (container.ContainerUpdateOKBody, error)

-	ContainerWait(ctx context.Context, container string, condition container.WaitCondition) (<-chan container.ContainerWaitOKBody, <-chan error)

+	ContainerUpdate(ctx context.Context, container string, updateConfig containertypes.UpdateConfig) (containertypes.ContainerUpdateOKBody, error)

+	ContainerWait(ctx context.Context, container string, condition containertypes.WaitCondition) (<-chan containertypes.ContainerWaitOKBody, <-chan error)

 	CopyFromContainer(ctx context.Context, container, srcPath string) (io.ReadCloser, types.ContainerPathStat, error)

 	CopyToContainer(ctx context.Context, container, path string, content io.Reader, options types.CopyToContainerOptions) error

 	ContainersPrune(ctx context.Context, pruneFilters filters.Args) (types.ContainersPruneReport, error)

@@ -100,13 +100,13 @@ type ImageAPIClient interface {

 // NetworkAPIClient defines API client methods for the networks

 type NetworkAPIClient interface {

-	NetworkConnect(ctx context.Context, networkID, container string, config *network.EndpointSettings) error

+	NetworkConnect(ctx context.Context, network, container string, config *networktypes.EndpointSettings) error

 	NetworkCreate(ctx context.Context, name string, options types.NetworkCreate) (types.NetworkCreateResponse, error)

-	NetworkDisconnect(ctx context.Context, networkID, container string, force bool) error

-	NetworkInspect(ctx context.Context, networkID string, options types.NetworkInspectOptions) (types.NetworkResource, error)

-	NetworkInspectWithRaw(ctx context.Context, networkID string, options types.NetworkInspectOptions) (types.NetworkResource, []byte, error)

+	NetworkDisconnect(ctx context.Context, network, container string, force bool) error

+	NetworkInspect(ctx context.Context, network string, options types.NetworkInspectOptions) (types.NetworkResource, error)

+	NetworkInspectWithRaw(ctx context.Context, network string, options types.NetworkInspectOptions) (types.NetworkResource, []byte, error)

 	NetworkList(ctx context.Context, options types.NetworkListOptions) ([]types.NetworkResource, error)

-	NetworkRemove(ctx context.Context, networkID string) error

+	NetworkRemove(ctx context.Context, network string) error

 	NetworksPrune(ctx context.Context, pruneFilter filters.Args) (types.NetworksPruneReport, error)

 }