diff --git a/backends/aggregate.go b/backends/aggregate.go
index 9d4ee296bb..51750a169a 100644
--- a/backends/aggregate.go
+++ b/backends/aggregate.go
@@ -30,11 +30,11 @@ func Aggregate() libswarm.Sender {
 }
 
 type aggregator struct {
-	backends []*libswarm.Object
+	backends []*libswarm.Client
 	server   *libswarm.Server
 }
 
-func newAggregator(allBackends *libswarm.Object, server *libswarm.Server, args []string) (*aggregator, error) {
+func newAggregator(allBackends *libswarm.Client, server *libswarm.Server, args []string) (*aggregator, error) {
 	a := &aggregator{server: server}
 
 	for _, argString := range args {
diff --git a/backends/backends.go b/backends/backends.go
index 2c21781a67..c93ffcae18 100644
--- a/backends/backends.go
+++ b/backends/backends.go
@@ -12,7 +12,7 @@ import (
 // engine, named after the desired backend.
 //
 // Example: `New().Job("debug").Run()`
-func New() *libswarm.Object {
+func New() *libswarm.Client {
 	backends := utils.NewTree()
 	backends.Bind("simulator", Simulator())
 	backends.Bind("debug", debug.Debug())
diff --git a/backends/dockerclient_test.go b/backends/dockerclient_test.go
index 519f704787..7c88310c07 100644
--- a/backends/dockerclient_test.go
+++ b/backends/dockerclient_test.go
@@ -240,7 +240,7 @@ func (s *stubServer) AllSummaries() []string {
 	return summaries
 }
 
-func instance(t *testing.T, server *stubServer) *libswarm.Object {
+func instance(t *testing.T, server *stubServer) *libswarm.Client {
 	url := "tcp://localhost:4243"
 	if server != nil {
 		url = strings.Replace(server.URL, "http://", "tcp://", 1)
@@ -254,7 +254,7 @@ func instance(t *testing.T, server *stubServer) *libswarm.Object {
 	return instance
 }
 
-func child(t *testing.T, server *stubServer, i *libswarm.Object, name string) *libswarm.Object {
+func child(t *testing.T, server *stubServer, i *libswarm.Client, name string) *libswarm.Client {
 	_, child, err := i.Attach(name)
 	if err != nil {
 		t.Fatal(err)
diff --git a/backends/ec2.go b/backends/ec2.go
index 6cc448a0ac..5f24c2aa98 100644
--- a/backends/ec2.go
+++ b/backends/ec2.go
@@ -39,7 +39,7 @@ type ec2Client struct {
 	Server         *libswarm.Server
 	instance       *ec2.Instance
 	sshTunnel      *os.Process
-	dockerInstance *libswarm.Object
+	dockerInstance *libswarm.Client
 }
 
 func (c *ec2Client) get(ctx *libswarm.Message) error {
diff --git a/object.go b/client.go
similarity index 68%
rename from object.go
rename to client.go
index 89a15e3fdb..375a43e0a7 100644
--- a/object.go
+++ b/client.go
@@ -8,23 +8,21 @@ import (
 	"strings"
 )
 
-// FIXME: rename Object to Client
-
-type Object struct {
+type Client struct {
 	Sender
 }
 
-func Obj(dst Sender) *Object {
-	return &Object{dst}
+func Obj(dst Sender) *Client {
+	return &Client{dst}
 }
 
-func (o *Object) Log(msg string, args ...interface{}) error {
-	_, err := o.Send(&Message{Verb: Log, Args: []string{fmt.Sprintf(msg, args...)}})
+func (c *Client) Log(msg string, args ...interface{}) error {
+	_, err := c.Send(&Message{Verb: Log, Args: []string{fmt.Sprintf(msg, args...)}})
 	return err
 }
 
-func (o *Object) Ls() ([]string, error) {
-	ret, err := o.Send(&Message{Verb: Ls, Ret: RetPipe})
+func (c *Client) Ls() ([]string, error) {
+	ret, err := c.Send(&Message{Verb: Ls, Ret: RetPipe})
 	if err != nil {
 		return nil, err
 	}
@@ -44,8 +42,8 @@ func (o *Object) Ls() ([]string, error) {
 	return nil, fmt.Errorf("unexpected verb %v", msg.Verb)
 }
 
-func (o *Object) Spawn(cmd ...string) (out *Object, err error) {
-	ret, err := o.Send(&Message{Verb: Spawn, Args: cmd, Ret: RetPipe})
+func (c *Client) Spawn(cmd ...string) (out *Client, err error) {
+	ret, err := c.Send(&Message{Verb: Spawn, Args: cmd, Ret: RetPipe})
 	if err != nil {
 		return nil, err
 	}
@@ -57,7 +55,7 @@ func (o *Object) Spawn(cmd ...string) (out *Object, err error) {
 		return nil, err
 	}
 	if msg.Verb == Ack {
-		return &Object{msg.Ret}, nil
+		return &Client{msg.Ret}, nil
 	}
 	msg.Ret.Close()
 	if msg.Verb == Error {
@@ -66,8 +64,8 @@ func (o *Object) Spawn(cmd ...string) (out *Object, err error) {
 	return nil, fmt.Errorf("unexpected verb %v", msg.Verb)
 }
 
-func (o *Object) Attach(name string) (in Receiver, out *Object, err error) {
-	ret, err := o.Send(&Message{Verb: Attach, Args: []string{name}, Ret: RetPipe})
+func (c *Client) Attach(name string) (in Receiver, out *Client, err error) {
+	ret, err := c.Send(&Message{Verb: Attach, Args: []string{name}, Ret: RetPipe})
 	if err != nil {
 		return nil, nil, err
 	}
@@ -79,7 +77,7 @@ func (o *Object) Attach(name string) (in Receiver, out *Object, err error) {
 		return nil, nil, err
 	}
 	if msg.Verb == Ack {
-		return ret, &Object{msg.Ret}, nil
+		return ret, &Client{msg.Ret}, nil
 	}
 	msg.Ret.Close()
 	if msg.Verb == Error {
@@ -88,13 +86,13 @@ func (o *Object) Attach(name string) (in Receiver, out *Object, err error) {
 	return nil, nil, fmt.Errorf("unexpected verb %v", msg.Verb)
 }
 
-func (o *Object) Error(msg string, args ...interface{}) error {
-	_, err := o.Send(&Message{Verb: Error, Args: []string{fmt.Sprintf(msg, args...)}})
+func (c *Client) Error(msg string, args ...interface{}) error {
+	_, err := c.Send(&Message{Verb: Error, Args: []string{fmt.Sprintf(msg, args...)}})
 	return err
 }
 
-func (o *Object) Connect() (net.Conn, error) {
-	ret, err := o.Send(&Message{Verb: Connect, Ret: RetPipe})
+func (c *Client) Connect() (net.Conn, error) {
+	ret, err := c.Send(&Message{Verb: Connect, Ret: RetPipe})
 	if err != nil {
 		return nil, err
 	}
@@ -121,21 +119,21 @@ func (o *Object) Connect() (net.Conn, error) {
 	return nil, fmt.Errorf("unexpected verb %v", msg.Verb)
 }
 
-func (o *Object) SetJson(val interface{}) error {
+func (c *Client) SetJson(val interface{}) error {
 	txt, err := json.Marshal(val)
 	if err != nil {
 		return err
 	}
-	return o.Set(string(txt))
+	return c.Set(string(txt))
 }
 
-func (o *Object) Set(vals ...string) error {
-	_, err := o.Send(&Message{Verb: Set, Args: vals})
+func (c *Client) Set(vals ...string) error {
+	_, err := c.Send(&Message{Verb: Set, Args: vals})
 	return err
 }
 
-func (o *Object) Get() (string, error) {
-	ret, err := o.Send(&Message{Verb: Get, Ret: RetPipe})
+func (c *Client) Get() (string, error) {
+	ret, err := c.Send(&Message{Verb: Get, Ret: RetPipe})
 	if err != nil {
 		return "", err
 	}
@@ -158,8 +156,8 @@ func (o *Object) Get() (string, error) {
 	return "", fmt.Errorf("unexpected verb %v", msg.Verb)
 }
 
-func (o *Object) Watch() (Receiver, error) {
-	ret, err := o.Send(&Message{Verb: Watch, Ret: RetPipe})
+func (c *Client) Watch() (Receiver, error) {
+	ret, err := c.Send(&Message{Verb: Watch, Ret: RetPipe})
 	if err != nil {
 		return nil, err
 	}
@@ -173,8 +171,8 @@ func (o *Object) Watch() (Receiver, error) {
 	return nil, fmt.Errorf("unexpected verb %v", msg.Verb)
 }
 
-func (o *Object) Start() error {
-	ret, err := o.Send(&Message{Verb: Start, Ret: RetPipe})
+func (c *Client) Start() error {
+	ret, err := c.Send(&Message{Verb: Start, Ret: RetPipe})
 	msg, err := ret.Receive(0)
 	if err == io.EOF {
 		return fmt.Errorf("unexpected EOF")
@@ -188,8 +186,8 @@ func (o *Object) Start() error {
 	return fmt.Errorf("unexpected verb %v", msg.Verb)
 }
 
-func (o *Object) Stop() error {
-	ret, err := o.Send(&Message{Verb: Stop, Ret: RetPipe})
+func (c *Client) Stop() error {
+	ret, err := c.Send(&Message{Verb: Stop, Ret: RetPipe})
 	msg, err := ret.Receive(0)
 	if err == io.EOF {
 		return fmt.Errorf("unexpected EOF")