diff --git a/backends/backends.go b/backends/backends.go
index 97e791f4d3..8c2bf45a60 100644
--- a/backends/backends.go
+++ b/backends/backends.go
@@ -17,6 +17,6 @@ func New() *beam.Object {
 	backends.Bind("fakeclient", FakeClient())
 	backends.Bind("forward", Forward())
 	backends.Bind("exec", Exec())
-	backends.Bind("apiserver", ApiServer())
+	backends.Bind("dockerserver", DockerServer())
 	return beam.Obj(backends)
 }
diff --git a/backends/apiserver.go b/backends/dockerserver.go
similarity index 98%
rename from backends/apiserver.go
rename to backends/dockerserver.go
index 4eabc25d81..1abad06394 100644
--- a/backends/apiserver.go
+++ b/backends/dockerserver.go
@@ -11,7 +11,7 @@ import (
 	"net/http"
 )
 
-func ApiServer() beam.Sender {
+func DockerServer() beam.Sender {
 	backend := beam.NewServer()
 	backend.OnSpawn(beam.Handler(func(ctx *beam.Message) error {
 		instance := beam.Task(func(in beam.Receiver, out beam.Sender) {
@@ -29,7 +29,7 @@ func ApiServer() beam.Sender {
 type HttpApiFunc func(out beam.Sender, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error
 
 func listenAndServe(proto, addr string, out beam.Sender) error {
-	fmt.Println("Starting API server...")
+	fmt.Println("Starting Docker server...")
 	r, err := createRouter(out)
 	if err != nil {
 		return err