diff --git a/cmd/ctr/run.go b/cmd/ctr/run.go
index 85958c8..51f703e 100644
--- a/cmd/ctr/run.go
+++ b/cmd/ctr/run.go
@@ -14,7 +14,7 @@ import (
 	"github.com/crosbymichael/console"
 	"github.com/docker/containerd/api/services/execution"
 	rootfsapi "github.com/docker/containerd/api/services/rootfs"
-	"github.com/docker/containerd/image"
+	"github.com/docker/containerd/images"
 	protobuf "github.com/gogo/protobuf/types"
 	"github.com/opencontainers/image-spec/identity"
 	"github.com/opencontainers/runtime-spec/specs-go"
@@ -224,7 +224,7 @@ var runCommand = cli.Command{
 
 		ref := context.Args().First()
 
-		im, err := image.Get(tx, ref)
+		image, err := images.Get(tx, ref)
 		if err != nil {
 			return errors.Wrapf(err, "could not resolve %q", ref)
 		}
@@ -232,7 +232,7 @@ var runCommand = cli.Command{
 		tx.Rollback()
 		db.Close()
 
-		diffIDs, err := im.RootFS(ctx, provider)
+		diffIDs, err := image.RootFS(ctx, provider)
 		if err != nil {
 			return err
 		}
diff --git a/cmd/ctr/utils.go b/cmd/ctr/utils.go
index a68cee2..ca41fe2 100644
--- a/cmd/ctr/utils.go
+++ b/cmd/ctr/utils.go
@@ -20,7 +20,7 @@ import (
 	rootfsapi "github.com/docker/containerd/api/services/rootfs"
 	"github.com/docker/containerd/api/types/container"
 	"github.com/docker/containerd/content"
-	"github.com/docker/containerd/image"
+	"github.com/docker/containerd/images"
 	contentservice "github.com/docker/containerd/services/content"
 	"github.com/pkg/errors"
 	"github.com/tonistiigi/fifo"
@@ -147,7 +147,7 @@ func getDB(ctx *cli.Context, readonly bool) (*bolt.DB, error) {
 	}
 
 	if !readonly {
-		if err := image.InitDB(db); err != nil {
+		if err := images.InitDB(db); err != nil {
 			return nil, err
 		}
 	}
diff --git a/cmd/dist/common.go b/cmd/dist/common.go
index ff00710..4a738ea 100644
--- a/cmd/dist/common.go
+++ b/cmd/dist/common.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/boltdb/bolt"
 	"github.com/docker/containerd/content"
-	"github.com/docker/containerd/image"
+	"github.com/docker/containerd/images"
 	"github.com/urfave/cli"
 	"google.golang.org/grpc"
 )
@@ -50,7 +50,7 @@ func getDB(ctx *cli.Context, readonly bool) (*bolt.DB, error) {
 	}
 
 	if !readonly {
-		if err := image.InitDB(db); err != nil {
+		if err := images.InitDB(db); err != nil {
 			return nil, err
 		}
 	}
diff --git a/cmd/dist/fetch.go b/cmd/dist/fetch.go
index 820d8d8..1895e76 100644
--- a/cmd/dist/fetch.go
+++ b/cmd/dist/fetch.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	contentapi "github.com/docker/containerd/api/services/content"
-	"github.com/docker/containerd/image"
+	"github.com/docker/containerd/images"
 	"github.com/docker/containerd/log"
 	"github.com/docker/containerd/progress"
 	"github.com/docker/containerd/remotes"
@@ -79,13 +79,13 @@ Most of this is experimental and there are few leaps to make this work.`,
 			log.G(ctx).WithField("image", name).Debug("fetching")
 			close(resolved)
 
-			return image.Dispatch(ctx,
-				image.Handlers(image.HandlerFunc(func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
+			return images.Dispatch(ctx,
+				images.Handlers(images.HandlerFunc(func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
 					ongoing.add(remotes.MakeRefKey(ctx, desc))
 					return nil, nil
 				}),
 					remotes.FetchHandler(ingester, fetcher),
-					image.ChildrenHandler(provider),
+					images.ChildrenHandler(provider),
 				),
 				desc)
 		})
diff --git a/cmd/dist/images.go b/cmd/dist/images.go
index 6b66569..800df2e 100644
--- a/cmd/dist/images.go
+++ b/cmd/dist/images.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"text/tabwriter"
 
-	"github.com/docker/containerd/image"
+	"github.com/docker/containerd/images"
 	"github.com/docker/containerd/progress"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
@@ -29,7 +29,7 @@ var imagesCommand = cli.Command{
 		}
 		defer tx.Rollback()
 
-		images, err := image.List(tx)
+		images, err := images.List(tx)
 		if err != nil {
 			return errors.Wrap(err, "failed to list images")
 		}
diff --git a/cmd/dist/pull.go b/cmd/dist/pull.go
index a3f2121..1c93f25 100644
--- a/cmd/dist/pull.go
+++ b/cmd/dist/pull.go
@@ -10,7 +10,7 @@ import (
 	contentapi "github.com/docker/containerd/api/services/content"
 	rootfsapi "github.com/docker/containerd/api/services/rootfs"
 	"github.com/docker/containerd/content"
-	"github.com/docker/containerd/image"
+	"github.com/docker/containerd/images"
 	"github.com/docker/containerd/log"
 	"github.com/docker/containerd/progress"
 	"github.com/docker/containerd/remotes"
@@ -87,7 +87,7 @@ command. As part of this process, we do the following:
 			close(resolved)
 
 			eg.Go(func() error {
-				return image.Register(tx, name, desc)
+				return images.Register(tx, name, desc)
 			})
 			defer func() {
 				if err := tx.Commit(); err != nil {
@@ -95,13 +95,13 @@ command. As part of this process, we do the following:
 				}
 			}()
 
-			return image.Dispatch(ctx,
-				image.Handlers(image.HandlerFunc(func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
+			return images.Dispatch(ctx,
+				images.Handlers(images.HandlerFunc(func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
 					ongoing.add(remotes.MakeRefKey(ctx, desc))
 					return nil, nil
 				}),
 					remotes.FetchHandler(ingester, fetcher),
-					image.ChildrenHandler(provider)),
+					images.ChildrenHandler(provider)),
 				desc)
 
 		})
@@ -123,7 +123,7 @@ command. As part of this process, we do the following:
 			// root filesystem chainid for the image. For now, we just print
 			// it, but we should keep track of this in the metadata storage.
 
-			image, err := image.Get(tx, resolvedImageName)
+			image, err := images.Get(tx, resolvedImageName)
 			if err != nil {
 				log.G(ctx).Fatal(err)
 			}
diff --git a/image/handlers.go b/images/handlers.go
similarity index 99%
rename from image/handlers.go
rename to images/handlers.go
index 4f97b95..f5f507b 100644
--- a/image/handlers.go
+++ b/images/handlers.go
@@ -1,4 +1,4 @@
-package image
+package images
 
 import (
 	"context"
diff --git a/image/image.go b/images/image.go
similarity index 99%
rename from image/image.go
rename to images/image.go
index edacda1..7e79664 100644
--- a/image/image.go
+++ b/images/image.go
@@ -1,4 +1,4 @@
-package image
+package images
 
 import (
 	"context"
diff --git a/image/storage.go b/images/storage.go
similarity index 99%
rename from image/storage.go
rename to images/storage.go
index 28b3070..02ceebe 100644
--- a/image/storage.go
+++ b/images/storage.go
@@ -1,4 +1,4 @@
-package image
+package images
 
 import (
 	"encoding/binary"
diff --git a/remotes/handlers.go b/remotes/handlers.go
index f621171..c6084b3 100644
--- a/remotes/handlers.go
+++ b/remotes/handlers.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/containerd/content"
-	"github.com/docker/containerd/image"
+	"github.com/docker/containerd/images"
 	"github.com/docker/containerd/log"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
@@ -19,10 +19,10 @@ func MakeRefKey(ctx context.Context, desc ocispec.Descriptor) string {
 	// product of the context, which may include information about the ongoing
 	// fetch process.
 	switch desc.MediaType {
-	case image.MediaTypeDockerSchema2Manifest, ocispec.MediaTypeImageManifest,
-		image.MediaTypeDockerSchema2ManifestList, ocispec.MediaTypeImageIndex:
+	case images.MediaTypeDockerSchema2Manifest, ocispec.MediaTypeImageManifest,
+		images.MediaTypeDockerSchema2ManifestList, ocispec.MediaTypeImageIndex:
 		return "manifest-" + desc.Digest.String()
-	case image.MediaTypeDockerSchema2Layer, image.MediaTypeDockerSchema2LayerGzip:
+	case images.MediaTypeDockerSchema2Layer, images.MediaTypeDockerSchema2LayerGzip:
 		return "layer-" + desc.Digest.String()
 	case "application/vnd.docker.container.image.v1+json":
 		return "config-" + desc.Digest.String()
@@ -35,7 +35,7 @@ func MakeRefKey(ctx context.Context, desc ocispec.Descriptor) string {
 // FetchHandler returns a handler that will fetch all content into the ingester
 // discovered in a call to Dispatch. Use with ChildrenHandler to do a full
 // recursive fetch.
-func FetchHandler(ingester content.Ingester, fetcher Fetcher) image.HandlerFunc {
+func FetchHandler(ingester content.Ingester, fetcher Fetcher) images.HandlerFunc {
 	return func(ctx context.Context, desc ocispec.Descriptor) (subdescs []ocispec.Descriptor, err error) {
 		ctx = log.WithLogger(ctx, log.G(ctx).WithFields(logrus.Fields{
 			"digest":    desc.Digest,
@@ -44,7 +44,7 @@ func FetchHandler(ingester content.Ingester, fetcher Fetcher) image.HandlerFunc
 		}))
 
 		switch desc.MediaType {
-		case image.MediaTypeDockerSchema2ManifestList, ocispec.MediaTypeImageIndex:
+		case images.MediaTypeDockerSchema2ManifestList, ocispec.MediaTypeImageIndex:
 			return nil, fmt.Errorf("%v not yet supported", desc.MediaType)
 		default:
 			err := fetch(ctx, ingester, fetcher, desc)