diff --git a/agent/exec/container/adapter.go b/agent/exec/dockerapi/adapter.go
similarity index 99%
rename from agent/exec/container/adapter.go
rename to agent/exec/dockerapi/adapter.go
index c5a50c2e36..4ae15d0d0b 100644
--- a/agent/exec/container/adapter.go
+++ b/agent/exec/dockerapi/adapter.go
@@ -1,4 +1,4 @@
-package container
+package dockerapi
 
 import (
 	"encoding/json"
diff --git a/agent/exec/container/api_client_test.mock.go b/agent/exec/dockerapi/api_client_test.mock.go
similarity index 99%
rename from agent/exec/container/api_client_test.mock.go
rename to agent/exec/dockerapi/api_client_test.mock.go
index d8f4cabd11..a30382c32a 100644
--- a/agent/exec/container/api_client_test.mock.go
+++ b/agent/exec/dockerapi/api_client_test.mock.go
@@ -1,7 +1,7 @@
 // Automatically generated by MockGen. DO NOT EDIT!
 // Source: github.com/docker/docker/client (interfaces: APIClient)
 
-package container
+package dockerapi
 
 import (
 	types "github.com/docker/docker/api/types"
diff --git a/agent/exec/container/container.go b/agent/exec/dockerapi/container.go
similarity index 99%
rename from agent/exec/container/container.go
rename to agent/exec/dockerapi/container.go
index 899c66ef20..3ab52283ce 100644
--- a/agent/exec/container/container.go
+++ b/agent/exec/dockerapi/container.go
@@ -1,4 +1,4 @@
-package container
+package dockerapi
 
 import (
 	"errors"
diff --git a/agent/exec/container/container_test.go b/agent/exec/dockerapi/container_test.go
similarity index 99%
rename from agent/exec/container/container_test.go
rename to agent/exec/dockerapi/container_test.go
index 698c006477..c061bf6c27 100644
--- a/agent/exec/container/container_test.go
+++ b/agent/exec/dockerapi/container_test.go
@@ -1,4 +1,4 @@
-package container
+package dockerapi
 
 import (
 	"reflect"
diff --git a/agent/exec/container/controller.go b/agent/exec/dockerapi/controller.go
similarity index 99%
rename from agent/exec/container/controller.go
rename to agent/exec/dockerapi/controller.go
index 8a34eaad97..610b9b0c05 100644
--- a/agent/exec/container/controller.go
+++ b/agent/exec/dockerapi/controller.go
@@ -1,4 +1,4 @@
-package container
+package dockerapi
 
 import (
 	"bufio"
diff --git a/agent/exec/container/controller_integration_test.go b/agent/exec/dockerapi/controller_integration_test.go
similarity index 99%
rename from agent/exec/container/controller_integration_test.go
rename to agent/exec/dockerapi/controller_integration_test.go
index cd59b40962..1b437bd88a 100644
--- a/agent/exec/container/controller_integration_test.go
+++ b/agent/exec/dockerapi/controller_integration_test.go
@@ -1,4 +1,4 @@
-package container
+package dockerapi
 
 import (
 	"flag"
diff --git a/agent/exec/container/controller_test.go b/agent/exec/dockerapi/controller_test.go
similarity index 99%
rename from agent/exec/container/controller_test.go
rename to agent/exec/dockerapi/controller_test.go
index d60909ad68..5e059b16d8 100644
--- a/agent/exec/container/controller_test.go
+++ b/agent/exec/dockerapi/controller_test.go
@@ -1,4 +1,4 @@
-package container
+package dockerapi
 
 import (
 	"bytes"
@@ -28,7 +28,7 @@ var tenSecond = 10 * time.Second
 // UPDATE(stevvooe): Gomock is still broken garbage. Sigh. This time, had to
 // generate, then manually "unvendor" imports. Further cements the
 // realization that mocks are a garbage way to build tests.
-//+go:generate mockgen -package container -destination api_client_test.mock.go github.com/docker/docker/client APIClient
+//+go:generate mockgen -package dockerapi -destination api_client_test.mock.go github.com/docker/docker/client APIClient
 
 func TestControllerPrepare(t *testing.T) {
 	task := genTask(t)
diff --git a/agent/exec/container/errors.go b/agent/exec/dockerapi/errors.go
similarity index 96%
rename from agent/exec/container/errors.go
rename to agent/exec/dockerapi/errors.go
index fe8909aef4..43e857c129 100644
--- a/agent/exec/container/errors.go
+++ b/agent/exec/dockerapi/errors.go
@@ -1,4 +1,4 @@
-package container
+package dockerapi
 
 import "errors"
 
diff --git a/agent/exec/container/executor.go b/agent/exec/dockerapi/executor.go
similarity index 99%
rename from agent/exec/container/executor.go
rename to agent/exec/dockerapi/executor.go
index ecba02bfa8..f5817688ee 100644
--- a/agent/exec/container/executor.go
+++ b/agent/exec/dockerapi/executor.go
@@ -1,4 +1,4 @@
-package container
+package dockerapi
 
 import (
 	"sort"
diff --git a/cmd/swarmd/main.go b/cmd/swarmd/main.go
index b2a6f70eaf..ffd43d9aa6 100644
--- a/cmd/swarmd/main.go
+++ b/cmd/swarmd/main.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	engineapi "github.com/docker/docker/client"
-	"github.com/docker/swarmkit/agent/exec/container"
+	"github.com/docker/swarmkit/agent/exec/dockerapi"
 	"github.com/docker/swarmkit/cli"
 	"github.com/docker/swarmkit/log"
 	"github.com/docker/swarmkit/manager/encryption"
@@ -151,7 +151,7 @@ var (
 				return err
 			}
 
-			executor := container.NewExecutor(client)
+			executor := dockerapi.NewExecutor(client)
 
 			if debugAddr != "" {
 				go func() {