diff --git a/context/store/store.go b/context/store/store.go
index 53355c0df..25c604ddd 100644
--- a/context/store/store.go
+++ b/context/store/store.go
@@ -96,7 +96,8 @@ const (
 	// AciContextType is the endpoint key in the context endpoints for an ACI
 	// backend
 	AciContextType = "aci"
-	// LocalContextType is the endpoint key in the context endpoints for a new local backend
+	// LocalContextType is the endpoint key in the context endpoints for a new
+	// local backend
 	LocalContextType = "local"
 	// ExampleContextType is the endpoint key in the context endpoints for an
 	// example backend
diff --git a/context/store/storedefault.go b/context/store/storedefault.go
index 95785c1f5..b3e66337a 100644
--- a/context/store/storedefault.go
+++ b/context/store/storedefault.go
@@ -8,7 +8,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-const defaultContextType = "docker"
+const defaultContextType = "moby"
 
 // Represents a context as created by the docker cli
 type defaultContext struct {
diff --git a/tests/e2e/testdata/ls-out-default-windows.golden b/tests/e2e/testdata/ls-out-default-windows.golden
index 19ebe37d3..c01e06593 100644
--- a/tests/e2e/testdata/ls-out-default-windows.golden
+++ b/tests/e2e/testdata/ls-out-default-windows.golden
@@ -1,2 +1,2 @@
 NAME                TYPE                DESCRIPTION                               DOCKER ENDPOINT                  KUBERNETES ENDPOINT   ORCHESTRATOR
-default *           docker              Current DOCKER_HOST based configuration   npipe:////./pipe/docker_engine                         swarm
+default *           moby                Current DOCKER_HOST based configuration   npipe:////./pipe/docker_engine                         swarm
diff --git a/tests/e2e/testdata/ls-out-default.golden b/tests/e2e/testdata/ls-out-default.golden
index 9e361fa7e..838fc0036 100644
--- a/tests/e2e/testdata/ls-out-default.golden
+++ b/tests/e2e/testdata/ls-out-default.golden
@@ -1,2 +1,2 @@
 NAME                TYPE                DESCRIPTION                               DOCKER ENDPOINT               KUBERNETES ENDPOINT   ORCHESTRATOR
-default *           docker              Current DOCKER_HOST based configuration   unix:///var/run/docker.sock                         swarm
+default *           moby                Current DOCKER_HOST based configuration   unix:///var/run/docker.sock                         swarm
diff --git a/tests/e2e/testdata/ls-out-test-docker-windows.golden b/tests/e2e/testdata/ls-out-test-docker-windows.golden
index 09bb66b6b..5074d4126 100644
--- a/tests/e2e/testdata/ls-out-test-docker-windows.golden
+++ b/tests/e2e/testdata/ls-out-test-docker-windows.golden
@@ -1,3 +1,3 @@
 NAME                TYPE                DESCRIPTION                               DOCKER ENDPOINT                  KUBERNETES ENDPOINT   ORCHESTRATOR
-default *           docker              Current DOCKER_HOST based configuration   npipe:////./pipe/docker_engine                         swarm
-test-docker         docker                                                        npipe:////./pipe/docker_engine                         swarm
+default *           moby                Current DOCKER_HOST based configuration   npipe:////./pipe/docker_engine                         swarm
+test-docker         moby                                                          npipe:////./pipe/docker_engine                         swarm
diff --git a/tests/e2e/testdata/ls-out-test-docker.golden b/tests/e2e/testdata/ls-out-test-docker.golden
index 03718eac4..b0c8e97a4 100644
--- a/tests/e2e/testdata/ls-out-test-docker.golden
+++ b/tests/e2e/testdata/ls-out-test-docker.golden
@@ -1,3 +1,3 @@
 NAME                TYPE                DESCRIPTION                               DOCKER ENDPOINT               KUBERNETES ENDPOINT   ORCHESTRATOR
-default *           docker              Current DOCKER_HOST based configuration   unix:///var/run/docker.sock                         swarm
-test-docker         docker                                                        unix:///var/run/docker.sock                         swarm
+default *           moby                Current DOCKER_HOST based configuration   unix:///var/run/docker.sock                         swarm
+test-docker         moby                                                          unix:///var/run/docker.sock                         swarm
diff --git a/tests/e2e/testdata/ls-out-test-example-windows.golden b/tests/e2e/testdata/ls-out-test-example-windows.golden
index 1df1196f9..95878b1ad 100644
--- a/tests/e2e/testdata/ls-out-test-example-windows.golden
+++ b/tests/e2e/testdata/ls-out-test-example-windows.golden
@@ -1,3 +1,3 @@
 NAME                TYPE                DESCRIPTION                               DOCKER ENDPOINT                  KUBERNETES ENDPOINT   ORCHESTRATOR
-default             docker              Current DOCKER_HOST based configuration   npipe:////./pipe/docker_engine                         swarm
+default             moby                Current DOCKER_HOST based configuration   npipe:////./pipe/docker_engine                         swarm
 test-example *      example                                                                                                              
diff --git a/tests/e2e/testdata/ls-out-test-example.golden b/tests/e2e/testdata/ls-out-test-example.golden
index 2508cb890..efdb5180c 100644
--- a/tests/e2e/testdata/ls-out-test-example.golden
+++ b/tests/e2e/testdata/ls-out-test-example.golden
@@ -1,3 +1,3 @@
 NAME                TYPE                DESCRIPTION                               DOCKER ENDPOINT               KUBERNETES ENDPOINT   ORCHESTRATOR
-default             docker              Current DOCKER_HOST based configuration   unix:///var/run/docker.sock                         swarm
+default             moby                Current DOCKER_HOST based configuration   unix:///var/run/docker.sock                         swarm
 test-example *      example