From 2036680a3a20902e554dee0d648b2fb0382dba27 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Fri, 2 Jun 2017 13:45:06 -0400
Subject: [PATCH] Finish renaming oci-storage to containers-storage

Update the rest of the documentation, scripts, and output.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
---
 README.md                                     |  4 +-
 cmd/containers-storage/main.go                |  6 +-
 cmd/containers-storage/version.go             |  2 +-
 docs/containers-storage-add-names.md          | 12 +--
 docs/containers-storage-applydiff.md          | 16 ++--
 docs/containers-storage-changes.md            | 16 ++--
 docs/containers-storage-container.md          | 12 +--
 docs/containers-storage-containers.md         | 10 +--
 docs/containers-storage-create-container.md   | 14 +--
 docs/containers-storage-create-image.md       | 14 +--
 docs/containers-storage-create-layer.md       | 14 +--
 docs/containers-storage-delete-container.md   | 14 +--
 docs/containers-storage-delete-image.md       | 14 +--
 docs/containers-storage-delete-layer.md       | 14 +--
 docs/containers-storage-delete.md             | 14 +--
 docs/containers-storage-diff.md               | 14 +--
 docs/containers-storage-diffsize.md           | 14 +--
 docs/containers-storage-exists.md             |  8 +-
 docs/containers-storage-get-container-data.md | 12 +--
 docs/containers-storage-get-container-dir.md  | 10 +--
 ...ontainers-storage-get-container-run-dir.md | 10 +--
 docs/containers-storage-get-image-data.md     | 12 +--
 docs/containers-storage-image.md              | 12 +--
 docs/containers-storage-images.md             | 10 +--
 docs/containers-storage-layers.md             | 10 +--
 .../containers-storage-list-container-data.md | 12 +--
 docs/containers-storage-list-image-data.md    | 12 +--
 docs/containers-storage-metadata.md           | 10 +--
 docs/containers-storage-mount.md              | 10 +--
 docs/containers-storage-set-container-data.md | 12 +--
 docs/containers-storage-set-image-data.md     | 12 +--
 docs/containers-storage-set-metadata.md       | 10 +--
 docs/containers-storage-set-names.md          | 12 +--
 docs/containers-storage-shutdown.md           |  8 +-
 docs/containers-storage-status.md             | 10 +--
 docs/containers-storage-unmount.md            | 12 +--
 docs/containers-storage-version.md            | 12 +--
 docs/containers-storage-wipe.md               |  8 +-
 docs/containers-storage.md                    | 86 +++++++++----------
 pkg/plugins/discovery.go                      |  4 +-
 pkg/plugins/discovery_test.go                 | 28 +++---
 pkg/plugins/plugins.go                        |  9 +-
 tests/helpers.bash                            |  2 +-
 43 files changed, 279 insertions(+), 278 deletions(-)

diff --git a/README.md b/README.md
index 4d100a35a..00a47fd98 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 `storage` is a Go library which aims to provide methods for storing filesystem
-layers, container images, and containers.  An `oci-storage` CLI wrapper is also
-included for manual and scripting use.
+layers, container images, and containers.  A `containers-storage` CLI wrapper
+is also included for manual and scripting use.
 
 To build the CLI wrapper, use 'make build-binary'.
 
diff --git a/cmd/containers-storage/main.go b/cmd/containers-storage/main.go
index 1ba6017b0..e3ea91e03 100644
--- a/cmd/containers-storage/main.go
+++ b/cmd/containers-storage/main.go
@@ -44,9 +44,9 @@ func main() {
 		return flags
 	}
 
-	flags := makeFlags("oci-storage", mflag.ContinueOnError)
+	flags := makeFlags("containers-storage", mflag.ContinueOnError)
 	flags.Usage = func() {
-		fmt.Printf("Usage: oci-storage command [options [...]]\n\n")
+		fmt.Printf("Usage: containers-storage command [options [...]]\n\n")
 		fmt.Printf("Commands:\n\n")
 		for _, command := range commands {
 			fmt.Printf("  %-22s%s\n", command.names[0], command.usage)
@@ -81,7 +81,7 @@ func main() {
 					command.addFlags(flags, &command)
 				}
 				flags.Usage = func() {
-					fmt.Printf("Usage: oci-storage %s %s\n\n", cmd, command.optionsHelp)
+					fmt.Printf("Usage: containers-storage %s %s\n\n", cmd, command.optionsHelp)
 					fmt.Printf("%s\n", command.usage)
 					fmt.Printf("\nOptions:\n")
 					flags.PrintDefaults()
diff --git a/cmd/containers-storage/version.go b/cmd/containers-storage/version.go
index fceef747b..db910c698 100644
--- a/cmd/containers-storage/version.go
+++ b/cmd/containers-storage/version.go
@@ -28,7 +28,7 @@ func version(flags *mflag.FlagSet, action string, m storage.Store, args []string
 func init() {
 	commands = append(commands, command{
 		names:   []string{"version"},
-		usage:   "Return oci-storage version information",
+		usage:   "Return containers-storage version information",
 		minArgs: 0,
 		action:  version,
 		addFlags: func(flags *mflag.FlagSet, cmd *command) {
diff --git a/docs/containers-storage-add-names.md b/docs/containers-storage-add-names.md
index c55a6562f..967881c60 100644
--- a/docs/containers-storage-add-names.md
+++ b/docs/containers-storage-add-names.md
@@ -1,14 +1,14 @@
-## oci-storage-add-names "August 2016"
+## containers-storage-add-names "August 2016"
 
 ## NAME
-oci-storage add-names - Add names to a layer/image/container
+containers-storage add-names - Add names to a layer/image/container
 
 ## SYNOPSIS
-**oci-storage** **add-names** [*options* [...]] *layerOrImageOrContainerNameOrID*
+**containers-storage** **add-names** [*options* [...]] *layerOrImageOrContainerNameOrID*
 
 ## DESCRIPTION
 In addition to IDs, *layers*, *images*, and *containers* can have
-human-readable names assigned to them in *oci-storage*.  The *add-names*
+human-readable names assigned to them in *containers-storage*.  The *add-names*
 command can be used to add one or more names to them.
 
 ## OPTIONS
@@ -19,7 +19,7 @@ is already used by another layer, image, or container, it is removed from that
 other layer, image, or container.
 
 ## EXAMPLE
-**oci-storage add-names -n my-awesome-container -n my-for-realsies-awesome-container f3be6c6134d0d980936b4c894f1613b69a62b79588fdeda744d0be3693bde8ec**
+**containers-storage add-names -n my-awesome-container -n my-for-realsies-awesome-container f3be6c6134d0d980936b4c894f1613b69a62b79588fdeda744d0be3693bde8ec**
 
 ## SEE ALSO
-oci-storage-set-names(1)
+containers-storage-set-names(1)
diff --git a/docs/containers-storage-applydiff.md b/docs/containers-storage-applydiff.md
index ff409a9ca..bfe9ed25d 100644
--- a/docs/containers-storage-applydiff.md
+++ b/docs/containers-storage-applydiff.md
@@ -1,10 +1,10 @@
-## oci-storage-apply-diff 1 "August 2016"
+## containers-storage-apply-diff 1 "August 2016"
 
 ## NAME
-oci-storage apply-diff - Apply a layer diff to a layer
+containers-storage apply-diff - Apply a layer diff to a layer
 
 ## SYNOPSIS
-**oci-storage** **apply-diff** [*options* [...]] *layerNameOrID* [*referenceLayerNameOrID*]
+**containers-storage** **apply-diff** [*options* [...]] *layerNameOrID* [*referenceLayerNameOrID*]
 
 ## DESCRIPTION
 When a layer is first created, it contains no changes relative to its parent
@@ -12,7 +12,7 @@ layer.  The layer can either be mounted read-write and its contents modified
 directly, or contents can be added (or removed) by applying a layer diff.  A
 layer diff takes the form of a (possibly compressed) tar archive with
 additional information present in its headers, and can be produced by running
-*oci-storage diff* or an equivalent.
+*containers-storage diff* or an equivalent.
 
 Layer diffs are not typically applied manually.  More often they are applied by
 a tool which is being used to import an entire image, such as **skopeo**.
@@ -24,9 +24,9 @@ Specifies the name of a file from which the diff should be read.  If this
 option is not used, the diff is read from standard input.
 
 ## EXAMPLE
-**oci-storage apply-diff -f 71841c97e320d6cde.tar.gz layer1**
+**containers-storage apply-diff -f 71841c97e320d6cde.tar.gz layer1**
 
 ## SEE ALSO
-oci-storage-changes(1)
-oci-storage-diff(1)
-oci-storage-diffsize(1)
+containers-storage-changes(1)
+containers-storage-diff(1)
+containers-storage-diffsize(1)
diff --git a/docs/containers-storage-changes.md b/docs/containers-storage-changes.md
index b5847e3d8..87fa18c4f 100644
--- a/docs/containers-storage-changes.md
+++ b/docs/containers-storage-changes.md
@@ -1,21 +1,21 @@
-## oci-storage-changes 1 "August 2016"
+## containers-storage-changes 1 "August 2016"
 
 ## NAME
-oci-storage changes - Produce a list of changes in a layer
+containers-storage changes - Produce a list of changes in a layer
 
 ## SYNOPSIS
-**oci-storage** **changes** *layerNameOrID* [*referenceLayerNameOrID*]
+**containers-storage** **changes** *layerNameOrID* [*referenceLayerNameOrID*]
 
 ## DESCRIPTION
 When a layer is first created, it contains no changes relative to its parent
-layer.  After that is changed, the *oci-storage changes* command can be used to
+layer.  After that is changed, the *containers-storage changes* command can be used to
 obtain a summary of which files have been added, deleted, or modified in the
 layer.
 
 ## EXAMPLE
-**oci-storage changes f3be6c6134d0d980936b4c894f1613b69a62b79588fdeda744d0be3693bde8ec**
+**containers-storage changes f3be6c6134d0d980936b4c894f1613b69a62b79588fdeda744d0be3693bde8ec**
 
 ## SEE ALSO
-oci-storage-applydiff(1)
-oci-storage-diff(1)
-oci-storage-diffsize(1)
+containers-storage-applydiff(1)
+containers-storage-diff(1)
+containers-storage-diffsize(1)
diff --git a/docs/containers-storage-container.md b/docs/containers-storage-container.md
index d5cf842a9..149157967 100644
--- a/docs/containers-storage-container.md
+++ b/docs/containers-storage-container.md
@@ -1,18 +1,18 @@
-## oci-storage-container 1 "August 2016"
+## containers-storage-container 1 "August 2016"
 
 ## NAME
-oci-storage container - Examine a single container
+containers-storage container - Examine a single container
 
 ## SYNOPSIS
-**oci-storage** **container** *containerNameOrID*
+**containers-storage** **container** *containerNameOrID*
 
 ## DESCRIPTION
 Retrieve information about a container: any names it has, which image was used
 to create it, any names that image has, and the ID of the container's layer.
 
 ## EXAMPLE
-**oci-storage container f3be6c6134d0d980936b4c894f1613b69a62b79588fdeda744d0be3693bde8ec**
-**oci-storage container my-awesome-container**
+**containers-storage container f3be6c6134d0d980936b4c894f1613b69a62b79588fdeda744d0be3693bde8ec**
+**containers-storage container my-awesome-container**
 
 ## SEE ALSO
-oci-storage-containers(1)
+containers-storage-containers(1)
diff --git a/docs/containers-storage-containers.md b/docs/containers-storage-containers.md
index 8b4041a49..7d394ef80 100644
--- a/docs/containers-storage-containers.md
+++ b/docs/containers-storage-containers.md
@@ -1,16 +1,16 @@
-## oci-storage-containers 1 "August 2016"
+## containers-storage-containers 1 "August 2016"
 
 ## NAME
-oci-storage containers - List known containers
+containers-storage containers - List known containers
 
 ## SYNOPSIS
-**oci-storage** **containers**
+**containers-storage** **containers**
 
 ## DESCRIPTION
 Retrieves information about all known containers and lists their IDs and names.
 
 ## EXAMPLE
-**oci-storage containers**
+**containers-storage containers**
 
 ## SEE ALSO
-oci-storage-container(1)
+containers-storage-container(1)
diff --git a/docs/containers-storage-create-container.md b/docs/containers-storage-create-container.md
index f5c992ef6..465777792 100644
--- a/docs/containers-storage-create-container.md
+++ b/docs/containers-storage-create-container.md
@@ -1,10 +1,10 @@
-## oci-storage-create-container 1 "August 2016"
+## containers-storage-create-container 1 "August 2016"
 
 ## NAME
-oci-storage create-container - Create a container
+containers-storage create-container - Create a container
 
 ## SYNOPSIS
-**oci-storage** **create-container** [*options*...] *imageNameOrID*
+**containers-storage** **create-container** [*options*...] *imageNameOrID*
 
 ## DESCRIPTION
 Creates a container, using the specified image as the starting point for its
@@ -29,9 +29,9 @@ Sets the metadata for the container to the specified value.
 Sets the metadata for the container to the contents of the specified file.
 
 ## EXAMPLE
-**oci-storage create-container -f manifest.json -n new-container goodimage**
+**containers-storage create-container -f manifest.json -n new-container goodimage**
 
 ## SEE ALSO
-oci-storage-create-image(1)
-oci-storage-create-layer(1)
-oci-storage-delete-container(1)
+containers-storage-create-image(1)
+containers-storage-create-layer(1)
+containers-storage-delete-container(1)
diff --git a/docs/containers-storage-create-image.md b/docs/containers-storage-create-image.md
index ba3109c69..00110b251 100644
--- a/docs/containers-storage-create-image.md
+++ b/docs/containers-storage-create-image.md
@@ -1,10 +1,10 @@
-## oci-storage-create-image 1 "August 2016"
+## containers-storage-create-image 1 "August 2016"
 
 ## NAME
-oci-storage create-image - Create an image
+containers-storage create-image - Create an image
 
 ## SYNOPSIS
-**oci-storage** **create-image** [*options*...] *topLayerNameOrID*
+**containers-storage** **create-image** [*options*...] *topLayerNameOrID*
 
 ## DESCRIPTION
 Creates an image, referring to the specified layer as the one which should be
@@ -29,9 +29,9 @@ Sets the metadata for the image to the specified value.
 Sets the metadata for the image to the contents of the specified file.
 
 ## EXAMPLE
-**oci-storage create-image -f manifest.json -n new-image somelayer**
+**containers-storage create-image -f manifest.json -n new-image somelayer**
 
 ## SEE ALSO
-oci-storage-create-container(1)
-oci-storage-create-layer(1)
-oci-storage-delete-image(1)
+containers-storage-create-container(1)
+containers-storage-create-layer(1)
+containers-storage-delete-image(1)
diff --git a/docs/containers-storage-create-layer.md b/docs/containers-storage-create-layer.md
index 09bb75ff4..851b7cf18 100644
--- a/docs/containers-storage-create-layer.md
+++ b/docs/containers-storage-create-layer.md
@@ -1,10 +1,10 @@
-## oci-storage-create-layer 1 "August 2016"
+## containers-storage-create-layer 1 "August 2016"
 
 ## NAME
-oci-storage create-layer - Create a layer
+containers-storage create-layer - Create a layer
 
 ## SYNOPSIS
-**oci-storage** **create-layer** [*options* [...]] [*parentLayerNameOrID*]
+**containers-storage** **create-layer** [*options* [...]] [*parentLayerNameOrID*]
 
 ## DESCRIPTION
 Creates a new layer which either has a specified layer as its parent, or if no
@@ -34,9 +34,9 @@ Sets the label which should be assigned as an SELinux context when mounting the
 layer.
 
 ## EXAMPLE
-**oci-storage create-layer -f manifest.json -n new-layer somelayer**
+**containers-storage create-layer -f manifest.json -n new-layer somelayer**
 
 ## SEE ALSO
-oci-storage-create-container(1)
-oci-storage-create-image(1)
-oci-storage-delete-layer(1)
+containers-storage-create-container(1)
+containers-storage-create-image(1)
+containers-storage-delete-layer(1)
diff --git a/docs/containers-storage-delete-container.md b/docs/containers-storage-delete-container.md
index 25f662421..4afa6d912 100644
--- a/docs/containers-storage-delete-container.md
+++ b/docs/containers-storage-delete-container.md
@@ -1,18 +1,18 @@
-## oci-storage-delete-container 1 "August 2016"
+## containers-storage-delete-container 1 "August 2016"
 
 ## NAME
-oci-storage delete-container - Delete a container
+containers-storage delete-container - Delete a container
 
 ## SYNOPSIS
-**oci-storage** **delete-container** *containerNameOrID*
+**containers-storage** **delete-container** *containerNameOrID*
 
 ## DESCRIPTION
 Deletes a container and its layer.
 
 ## EXAMPLE
-**oci-storage delete-container my-awesome-container**
+**containers-storage delete-container my-awesome-container**
 
 ## SEE ALSO
-oci-storage-create-container(1)
-oci-storage-delete-image(1)
-oci-storage-delete-layer(1)
+containers-storage-create-container(1)
+containers-storage-delete-image(1)
+containers-storage-delete-layer(1)
diff --git a/docs/containers-storage-delete-image.md b/docs/containers-storage-delete-image.md
index ba132fb1e..88503b2ce 100644
--- a/docs/containers-storage-delete-image.md
+++ b/docs/containers-storage-delete-image.md
@@ -1,10 +1,10 @@
-## oci-storage-delete-image 1 "August 2016"
+## containers-storage-delete-image 1 "August 2016"
 
 ## NAME
-oci-storage delete-image - Delete an image
+containers-storage delete-image - Delete an image
 
 ## SYNOPSIS
-**oci-storage** **delete-image** *imageNameOrID*
+**containers-storage** **delete-image** *imageNameOrID*
 
 ## DESCRIPTION
 Deletes an image if it is not currently being used by any containers.  If the
@@ -13,9 +13,9 @@ If that image's parent is then not being used by other images, it, too, will be
 removed, and the this will be repeated for each parent's parent.
 
 ## EXAMPLE
-**oci-storage delete-image my-base-image**
+**containers-storage delete-image my-base-image**
 
 ## SEE ALSO
-oci-storage-create-image(1)
-oci-storage-delete-container(1)
-oci-storage-delete-layer(1)
+containers-storage-create-image(1)
+containers-storage-delete-container(1)
+containers-storage-delete-layer(1)
diff --git a/docs/containers-storage-delete-layer.md b/docs/containers-storage-delete-layer.md
index a3fd20e60..a96d47cda 100644
--- a/docs/containers-storage-delete-layer.md
+++ b/docs/containers-storage-delete-layer.md
@@ -1,19 +1,19 @@
-## oci-storage-delete-layer 1 "August 2016"
+## containers-storage-delete-layer 1 "August 2016"
 
 ## NAME
-oci-storage delete-layer - Delete a layer
+containers-storage delete-layer - Delete a layer
 
 ## SYNOPSIS
-**oci-storage** **delete-layer** *layerNameOrID*
+**containers-storage** **delete-layer** *layerNameOrID*
 
 ## DESCRIPTION
 Deletes a layer if it is not currently being used by any images or containers,
 and is not the parent of any other layers.
 
 ## EXAMPLE
-**oci-storage delete-layer my-base-layer**
+**containers-storage delete-layer my-base-layer**
 
 ## SEE ALSO
-oci-storage-create-layer(1)
-oci-storage-delete-image(1)
-oci-storage-delete-layer(1)
+containers-storage-create-layer(1)
+containers-storage-delete-image(1)
+containers-storage-delete-layer(1)
diff --git a/docs/containers-storage-delete.md b/docs/containers-storage-delete.md
index 682102625..42ae68654 100644
--- a/docs/containers-storage-delete.md
+++ b/docs/containers-storage-delete.md
@@ -1,19 +1,19 @@
-## oci-storage-delete 1 "August 2016"
+## containers-storage-delete 1 "August 2016"
 
 ## NAME
-oci-storage delete - Force deletion of a layer, image, or container
+containers-storage delete - Force deletion of a layer, image, or container
 
 ## SYNOPSIS
-**oci-storage** **delete** *layerOrImageOrContainerNameOrID*
+**containers-storage** **delete** *layerOrImageOrContainerNameOrID*
 
 ## DESCRIPTION
 Deletes a specified layer, image, or container, with no safety checking.  This
 can corrupt data, and may be removed.
 
 ## EXAMPLE
-**oci-storage delete my-base-layer**
+**containers-storage delete my-base-layer**
 
 ## SEE ALSO
-oci-storage-delete-container(1)
-oci-storage-delete-image(1)
-oci-storage-delete-layer(1)
+containers-storage-delete-container(1)
+containers-storage-delete-image(1)
+containers-storage-delete-layer(1)
diff --git a/docs/containers-storage-diff.md b/docs/containers-storage-diff.md
index 6173eb151..8a1b2f243 100644
--- a/docs/containers-storage-diff.md
+++ b/docs/containers-storage-diff.md
@@ -1,10 +1,10 @@
-## oci-storage-diff 1 "August 2016"
+## containers-storage-diff 1 "August 2016"
 
 ## NAME
-oci-storage diff - Generate a layer diff
+containers-storage diff - Generate a layer diff
 
 ## SYNOPSIS
-**oci-storage** **diff** [*options* [...]] *layerNameOrID*
+**containers-storage** **diff** [*options* [...]] *layerNameOrID*
 
 ## DESCRIPTION
 Generates a layer diff representing the changes made in the specified layer.
@@ -29,9 +29,9 @@ Force the diff to be uncompressed.  If the layer was populated by a layer diff,
 and that layer diff was compressed, it will be decompressed for output.
 
 ## EXAMPLE
-**oci-storage diff my-base-layer**
+**containers-storage diff my-base-layer**
 
 ## SEE ALSO
-oci-storage-applydiff(1)
-oci-storage-changes(1)
-oci-storage-diffsize(1)
+containers-storage-applydiff(1)
+containers-storage-changes(1)
+containers-storage-diffsize(1)
diff --git a/docs/containers-storage-diffsize.md b/docs/containers-storage-diffsize.md
index c20efd5be..77f19345f 100644
--- a/docs/containers-storage-diffsize.md
+++ b/docs/containers-storage-diffsize.md
@@ -1,19 +1,19 @@
-## oci-storage-diffsize 1 "August 2016"
+## containers-storage-diffsize 1 "August 2016"
 
 ## NAME
-oci-storage diffsize - Compute the size of a layer diff
+containers-storage diffsize - Compute the size of a layer diff
 
 ## SYNOPSIS
-**oci-storage** **diffsize** *layerNameOrID*
+**containers-storage** **diffsize** *layerNameOrID*
 
 ## DESCRIPTION
 Computes the expected size of the layer diff which would be generated for the
 specified layer.
 
 ## EXAMPLE
-**oci-storage diffsize my-base-layer**
+**containers-storage diffsize my-base-layer**
 
 ## SEE ALSO
-oci-storage-applydiff(1)
-oci-storage-changes(1)
-oci-storage-diff(1)
+containers-storage-applydiff(1)
+containers-storage-changes(1)
+containers-storage-diff(1)
diff --git a/docs/containers-storage-exists.md b/docs/containers-storage-exists.md
index 9ad69e53e..dd8a4eb19 100644
--- a/docs/containers-storage-exists.md
+++ b/docs/containers-storage-exists.md
@@ -1,10 +1,10 @@
-## oci-storage-exists 1 "August 2016"
+## containers-storage-exists 1 "August 2016"
 
 ## NAME
-oci-storage exists - Check if a layer, image, or container exists
+containers-storage exists - Check if a layer, image, or container exists
 
 ## SYNOPSIS
-**oci-storage** **exists** [*options* [...]] *layerOrImageOrContainerNameOrID* [...]
+**containers-storage** **exists** [*options* [...]] *layerOrImageOrContainerNameOrID* [...]
 
 ## DESCRIPTION
 Checks if there are layers, images, or containers which have the specified
@@ -28,4 +28,4 @@ Only succeed if the names or IDs are that of layers.
 Suppress output.
 
 ## EXAMPLE
-**oci-storage exists my-base-layer**
+**containers-storage exists my-base-layer**
diff --git a/docs/containers-storage-get-container-data.md b/docs/containers-storage-get-container-data.md
index 319a7cf11..4e51eeeea 100644
--- a/docs/containers-storage-get-container-data.md
+++ b/docs/containers-storage-get-container-data.md
@@ -1,10 +1,10 @@
-## oci-storage-get-container-data 1 "August 2016"
+## containers-storage-get-container-data 1 "August 2016"
 
 ## NAME
-oci-storage get-container-data - Retrieve lookaside data for a container
+containers-storage get-container-data - Retrieve lookaside data for a container
 
 ## SYNOPSIS
-**oci-storage** **get-container-data** [*options* [...]] *containerNameOrID* *dataName*
+**containers-storage** **get-container-data** [*options* [...]] *containerNameOrID* *dataName*
 
 ## DESCRIPTION
 Retrieves a piece of named data which is associated with a container.
@@ -15,8 +15,8 @@ Retrieves a piece of named data which is associated with a container.
 Write the data to a file instead of stdout.
 
 ## EXAMPLE
-**oci-storage get-container-data -f config.json my-container configuration**
+**containers-storage get-container-data -f config.json my-container configuration**
 
 ## SEE ALSO
-oci-storage-list-container-data(1)
-oci-storage-set-container-data(1)
+containers-storage-list-container-data(1)
+containers-storage-set-container-data(1)
diff --git a/docs/containers-storage-get-container-dir.md b/docs/containers-storage-get-container-dir.md
index cb4132934..2ed972ae9 100644
--- a/docs/containers-storage-get-container-dir.md
+++ b/docs/containers-storage-get-container-dir.md
@@ -1,17 +1,17 @@
-## oci-storage-get-container-dir 1 "Sepember 2016"
+## containers-storage-get-container-dir 1 "Sepember 2016"
 
 ## NAME
-oci-storage get-container-dir - Find lookaside directory for a container
+containers-storage get-container-dir - Find lookaside directory for a container
 
 ## SYNOPSIS
-**oci-storage** **get-container-dir** [*options* [...]] *containerNameOrID*
+**containers-storage** **get-container-dir** [*options* [...]] *containerNameOrID*
 
 ## DESCRIPTION
 Prints the location of a directory which the caller can use to store lookaside
 information which should be cleaned up when the container is deleted.
 
 ## EXAMPLE
-**oci-storage get-container-dir my-container**
+**containers-storage get-container-dir my-container**
 
 ## SEE ALSO
-oci-storage-get-container-run-dir(1)
+containers-storage-get-container-run-dir(1)
diff --git a/docs/containers-storage-get-container-run-dir.md b/docs/containers-storage-get-container-run-dir.md
index e05e838f2..8690a0094 100644
--- a/docs/containers-storage-get-container-run-dir.md
+++ b/docs/containers-storage-get-container-run-dir.md
@@ -1,17 +1,17 @@
-## oci-storage-get-container-run-dir 1 "Sepember 2016"
+## containers-storage-get-container-run-dir 1 "Sepember 2016"
 
 ## NAME
-oci-storage get-container-run-dir - Find runtime lookaside directory for a container
+containers-storage get-container-run-dir - Find runtime lookaside directory for a container
 
 ## SYNOPSIS
-**oci-storage** **get-container-run-dir** [*options* [...]] *containerNameOrID*
+**containers-storage** **get-container-run-dir** [*options* [...]] *containerNameOrID*
 
 ## DESCRIPTION
 Prints the location of a directory which the caller can use to store lookaside
 information which should be cleaned up when the host is rebooted.
 
 ## EXAMPLE
-**oci-storage get-container-run-dir my-container**
+**containers-storage get-container-run-dir my-container**
 
 ## SEE ALSO
-oci-storage-get-container-dir(1)
+containers-storage-get-container-dir(1)
diff --git a/docs/containers-storage-get-image-data.md b/docs/containers-storage-get-image-data.md
index 34b532f99..07cb2e551 100644
--- a/docs/containers-storage-get-image-data.md
+++ b/docs/containers-storage-get-image-data.md
@@ -1,10 +1,10 @@
-## oci-storage-get-image-data 1 "August 2016"
+## containers-storage-get-image-data 1 "August 2016"
 
 ## NAME
-oci-storage get-image-data - Retrieve lookaside data for an image
+containers-storage get-image-data - Retrieve lookaside data for an image
 
 ## SYNOPSIS
-**oci-storage** **get-image-data** [*options* [...]] *imageNameOrID* *dataName*
+**containers-storage** **get-image-data** [*options* [...]] *imageNameOrID* *dataName*
 
 ## DESCRIPTION
 Retrieves a piece of named data which is associated with an image.
@@ -15,8 +15,8 @@ Retrieves a piece of named data which is associated with an image.
 Write the data to a file instead of stdout.
 
 ## EXAMPLE
-**oci-storage get-image-data -f manifest.json my-image manifest**
+**containers-storage get-image-data -f manifest.json my-image manifest**
 
 ## SEE ALSO
-oci-storage-list-image-data(1)
-oci-storage-set-image-data(1)
+containers-storage-list-image-data(1)
+containers-storage-set-image-data(1)
diff --git a/docs/containers-storage-image.md b/docs/containers-storage-image.md
index 909386f94..9988b0fef 100644
--- a/docs/containers-storage-image.md
+++ b/docs/containers-storage-image.md
@@ -1,18 +1,18 @@
-## oci-storage-image 1 "August 2016"
+## containers-storage-image 1 "August 2016"
 
 ## NAME
-oci-storage image - Examine a single image
+containers-storage image - Examine a single image
 
 ## SYNOPSIS
-**oci-storage** **image** *imageNameOrID*
+**containers-storage** **image** *imageNameOrID*
 
 ## DESCRIPTION
 Retrieve information about an image: its ID, any names it has, and the ID of
 its top layer.
 
 ## EXAMPLE
-**oci-storage image 49bff34e4baf9378c01733d02276a731a4c4771ebeab305020c5303679f88bb8**
-**oci-storage image my-favorite-image**
+**containers-storage image 49bff34e4baf9378c01733d02276a731a4c4771ebeab305020c5303679f88bb8**
+**containers-storage image my-favorite-image**
 
 ## SEE ALSO
-oci-storage-images(1)
+containers-storage-images(1)
diff --git a/docs/containers-storage-images.md b/docs/containers-storage-images.md
index db6baa7bd..00a381ac8 100644
--- a/docs/containers-storage-images.md
+++ b/docs/containers-storage-images.md
@@ -1,16 +1,16 @@
-## oci-storage-images 1 "August 2016"
+## containers-storage-images 1 "August 2016"
 
 ## NAME
-oci-storage images - List known images
+containers-storage images - List known images
 
 ## SYNOPSIS
-**oci-storage** **images**
+**containers-storage** **images**
 
 ## DESCRIPTION
 Retrieves information about all known images and lists their IDs and names.
 
 ## EXAMPLE
-**oci-storage images**
+**containers-storage images**
 
 ## SEE ALSO
-oci-storage-image(1)
+containers-storage-image(1)
diff --git a/docs/containers-storage-layers.md b/docs/containers-storage-layers.md
index 6dd921a9c..939916a2f 100644
--- a/docs/containers-storage-layers.md
+++ b/docs/containers-storage-layers.md
@@ -1,10 +1,10 @@
-## oci-storage-layers 1 "August 2016"
+## containers-storage-layers 1 "August 2016"
 
 ## NAME
-oci-storage layers - List known layers
+containers-storage layers - List known layers
 
 ## SYNOPSIS
-**oci-storage** [*options* [...]] **layers**
+**containers-storage** [*options* [...]] **layers**
 
 ## DESCRIPTION
 Retrieves information about all known layers and lists their IDs and names, the
@@ -19,5 +19,5 @@ Display results using a tree to show the hierarchy of parent-child
 relationships between layers.
 
 ## EXAMPLE
-**oci-storage layers**
-**oci-storage layers -t**
+**containers-storage layers**
+**containers-storage layers -t**
diff --git a/docs/containers-storage-list-container-data.md b/docs/containers-storage-list-container-data.md
index 5e4603777..f46332e4c 100644
--- a/docs/containers-storage-list-container-data.md
+++ b/docs/containers-storage-list-container-data.md
@@ -1,17 +1,17 @@
-## oci-storage-list-container-data 1 "August 2016"
+## containers-storage-list-container-data 1 "August 2016"
 
 ## NAME
-oci-storage list-container-data - List lookaside data for a container
+containers-storage list-container-data - List lookaside data for a container
 
 ## SYNOPSIS
-**oci-storage** **list-container-data** *containerNameOrID*
+**containers-storage** **list-container-data** *containerNameOrID*
 
 ## DESCRIPTION
 List the pieces of named data which are associated with a container.
 
 ## EXAMPLE
-**oci-storage list-container-data my-container**
+**containers-storage list-container-data my-container**
 
 ## SEE ALSO
-oci-storage-get-container-data(1)
-oci-storage-set-container-data(1)
+containers-storage-get-container-data(1)
+containers-storage-set-container-data(1)
diff --git a/docs/containers-storage-list-image-data.md b/docs/containers-storage-list-image-data.md
index 9629007d2..b33cd1e6b 100644
--- a/docs/containers-storage-list-image-data.md
+++ b/docs/containers-storage-list-image-data.md
@@ -1,17 +1,17 @@
-## oci-storage-list-image-data 1 "August 2016"
+## containers-storage-list-image-data 1 "August 2016"
 
 ## NAME
-oci-storage list-image-data - List lookaside data for an image
+containers-storage list-image-data - List lookaside data for an image
 
 ## SYNOPSIS
-**oci-storage** **list-image-data** *imageNameOrID*
+**containers-storage** **list-image-data** *imageNameOrID*
 
 ## DESCRIPTION
 List the pieces of named data which are associated with an image.
 
 ## EXAMPLE
-**oci-storage list-image-data my-image**
+**containers-storage list-image-data my-image**
 
 ## SEE ALSO
-oci-storage-get-image-data(1)
-oci-storage-list-image-data(1)
+containers-storage-get-image-data(1)
+containers-storage-list-image-data(1)
diff --git a/docs/containers-storage-metadata.md b/docs/containers-storage-metadata.md
index f08f72926..0ac629fb8 100644
--- a/docs/containers-storage-metadata.md
+++ b/docs/containers-storage-metadata.md
@@ -1,10 +1,10 @@
-## oci-storage-metadata 1 "August 2016"
+## containers-storage-metadata 1 "August 2016"
 
 ## NAME
-oci-storage metadata - Retrieve metadata for a layer, image, or container
+containers-storage metadata - Retrieve metadata for a layer, image, or container
 
 ## SYNOPSIS
-**oci-storage** **metadata** [*options* [...]] *layerOrImageOrContainerNameOrID*
+**containers-storage** **metadata** [*options* [...]] *layerOrImageOrContainerNameOrID*
 
 ## DESCRIPTION
 Outputs metadata associated with a layer, image, or container.  Metadata is
@@ -16,7 +16,7 @@ intended to be small, and is expected to be cached in memory.
 Don't print the ID or name of the item with which the metadata is associated.
 
 ## EXAMPLE
-**oci-storage metadata -q my-image > my-image.txt**
+**containers-storage metadata -q my-image > my-image.txt**
 
 ## SEE ALSO
-oci-storage-set-metadata(1)
+containers-storage-set-metadata(1)
diff --git a/docs/containers-storage-mount.md b/docs/containers-storage-mount.md
index de6982bad..0c00aff3b 100644
--- a/docs/containers-storage-mount.md
+++ b/docs/containers-storage-mount.md
@@ -1,10 +1,10 @@
-## oci-storage-mount 1 "August 2016"
+## containers-storage-mount 1 "August 2016"
 
 ## NAME
-oci-storage mount - Mount a layer or a container's layer for manipulation
+containers-storage mount - Mount a layer or a container's layer for manipulation
 
 ## SYNOPSIS
-**oci-storage** **mount** [*options* [...]] *layerOrContainerNameOrID*
+**containers-storage** **mount** [*options* [...]] *layerOrContainerNameOrID*
 
 ## DESCRIPTION
 Mounts a layer or a container's layer on the host's filesystem and prints the
@@ -16,7 +16,7 @@ mountpoint.
 Specify an SELinux context for the mounted layer.
 
 ## EXAMPLE
-**oci-storage mount my-container**
+**containers-storage mount my-container**
 
 ## SEE ALSO
-oci-storage-unmount(1)
+containers-storage-unmount(1)
diff --git a/docs/containers-storage-set-container-data.md b/docs/containers-storage-set-container-data.md
index 702975ba0..9cb30289f 100644
--- a/docs/containers-storage-set-container-data.md
+++ b/docs/containers-storage-set-container-data.md
@@ -1,10 +1,10 @@
-## oci-storage-set-container-data 1 "August 2016"
+## containers-storage-set-container-data 1 "August 2016"
 
 ## NAME
-oci-storage set-container-data - Set lookaside data for a container
+containers-storage set-container-data - Set lookaside data for a container
 
 ## SYNOPSIS
-**oci-storage** **set-container-data** [*options* [...]] *containerNameOrID* *dataName*
+**containers-storage** **set-container-data** [*options* [...]] *containerNameOrID* *dataName*
 
 ## DESCRIPTION
 Sets a piece of named data which is associated with a container.
@@ -15,8 +15,8 @@ Sets a piece of named data which is associated with a container.
 Read the data contents from a file instead of stdin.
 
 ## EXAMPLE
-**oci-storage set-container-data -f ./config.json my-container configuration**
+**containers-storage set-container-data -f ./config.json my-container configuration**
 
 ## SEE ALSO
-oci-storage-get-container-data(1)
-oci-storage-list-container-data(1)
+containers-storage-get-container-data(1)
+containers-storage-list-container-data(1)
diff --git a/docs/containers-storage-set-image-data.md b/docs/containers-storage-set-image-data.md
index f8faaa206..09187d677 100644
--- a/docs/containers-storage-set-image-data.md
+++ b/docs/containers-storage-set-image-data.md
@@ -1,10 +1,10 @@
-## oci-storage-set-image-data 1 "August 2016"
+## containers-storage-set-image-data 1 "August 2016"
 
 ## NAME
-oci-storage set-image-data - Set lookaside data for an image
+containers-storage set-image-data - Set lookaside data for an image
 
 ## SYNOPSIS
-**oci-storage** **set-image-data** [*options* [...]] *imageNameOrID* *dataName*
+**containers-storage** **set-image-data** [*options* [...]] *imageNameOrID* *dataName*
 
 ## DESCRIPTION
 Sets a piece of named data which is associated with an image.
@@ -15,8 +15,8 @@ Sets a piece of named data which is associated with an image.
 Read the data contents from a file instead of stdin.
 
 ## EXAMPLE
-**oci-storage set-image-data -f ./manifest.json my-image manifest**
+**containers-storage set-image-data -f ./manifest.json my-image manifest**
 
 ## SEE ALSO
-oci-storage-get-image-data(1)
-oci-storage-list-image-data(1)
+containers-storage-get-image-data(1)
+containers-storage-list-image-data(1)
diff --git a/docs/containers-storage-set-metadata.md b/docs/containers-storage-set-metadata.md
index 0e61f7c53..1589ce610 100644
--- a/docs/containers-storage-set-metadata.md
+++ b/docs/containers-storage-set-metadata.md
@@ -1,10 +1,10 @@
-## oci-storage-set-metadata 1 "August 2016"
+## containers-storage-set-metadata 1 "August 2016"
 
 ## NAME
-oci-storage set-metadata - Set metadata for a layer, image, or container
+containers-storage set-metadata - Set metadata for a layer, image, or container
 
 ## SYNOPSIS
-**oci-storage** **set-metadata** [*options* [...]] *layerOrImageOrContainerNameOrID*
+**containers-storage** **set-metadata** [*options* [...]] *layerOrImageOrContainerNameOrID*
 
 ## DESCRIPTION
 Updates the metadata associated with a layer, image, or container.  Metadata is
@@ -20,7 +20,7 @@ Use the contents of the specified file as the metadata.
 Use the specified value as the metadata.
 
 ## EXAMPLE
-**oci-storage set-metadata -m "compression: gzip" my-layer**
+**containers-storage set-metadata -m "compression: gzip" my-layer**
 
 ## SEE ALSO
-oci-storage-metadata(1)
+containers-storage-metadata(1)
diff --git a/docs/containers-storage-set-names.md b/docs/containers-storage-set-names.md
index 011b05e74..e4f676fd7 100644
--- a/docs/containers-storage-set-names.md
+++ b/docs/containers-storage-set-names.md
@@ -1,14 +1,14 @@
-## oci-storage-set-names 1 "August 2016"
+## containers-storage-set-names 1 "August 2016"
 
 ## NAME
-oci-storage set-names - Set names for a layer/image/container
+containers-storage set-names - Set names for a layer/image/container
 
 ## SYNOPSIS
-**oci-storage** **set-names** [**-n** *name* [...]] *layerOrImageOrContainerNameOrID*
+**containers-storage** **set-names** [**-n** *name* [...]] *layerOrImageOrContainerNameOrID*
 
 ## DESCRIPTION
 In addition to IDs, *layers*, *images*, and *containers* can have
-human-readable names assigned to them in *oci-storage*.  The *set-names*
+human-readable names assigned to them in *containers-storage*.  The *set-names*
 command can be used to reset the list of names for any of them.
 
 ## OPTIONS
@@ -21,7 +21,7 @@ this layer, image, or container, and which are not specified using this option,
 will be removed from the layer, image, or container.
 
 ## EXAMPLE
-**oci-storage set-names -n my-one-and-only-name f3be6c6134d0d980936b4c894f1613b69a62b79588fdeda744d0be3693bde8ec**
+**containers-storage set-names -n my-one-and-only-name f3be6c6134d0d980936b4c894f1613b69a62b79588fdeda744d0be3693bde8ec**
 
 ## SEE ALSO
-oci-storage-add-names(1)
+containers-storage-add-names(1)
diff --git a/docs/containers-storage-shutdown.md b/docs/containers-storage-shutdown.md
index 9e8dd120b..0ea6916cd 100644
--- a/docs/containers-storage-shutdown.md
+++ b/docs/containers-storage-shutdown.md
@@ -1,10 +1,10 @@
-## oci-storage-shutdown 1 "October 2016"
+## containers-storage-shutdown 1 "October 2016"
 
 ## NAME
-oci-storage shutdown - Shut down layer storage
+containers-storage shutdown - Shut down layer storage
 
 ## SYNOPSIS
-**oci-storage** **shutdown** [*options* [...]]
+**containers-storage** **shutdown** [*options* [...]]
 
 ## DESCRIPTION
 Shuts down the layer storage driver, which may be using kernel resources.
@@ -17,4 +17,4 @@ driver.  If this option is not specified, if any layers are mounted, shutdown
 will not be attempted.
 
 ## EXAMPLE
-**oci-storage shutdown**
+**containers-storage shutdown**
diff --git a/docs/containers-storage-status.md b/docs/containers-storage-status.md
index b8d2ca556..fc8a39c59 100644
--- a/docs/containers-storage-status.md
+++ b/docs/containers-storage-status.md
@@ -1,16 +1,16 @@
-## oci-storage-status 1 "August 2016"
+## containers-storage-status 1 "August 2016"
 
 ## NAME
-oci-storage status - Output status information from the storage library's driver
+containers-storage status - Output status information from the storage library's driver
 
 ## SYNOPSIS
-**oci-storage** **status**
+**containers-storage** **status**
 
 ## DESCRIPTION
 Queries the storage library's driver for status information.
 
 ## EXAMPLE
-**oci-storage status**
+**containers-storage status**
 
 ## SEE ALSO
-oci-storage-version(1)
+containers-storage-version(1)
diff --git a/docs/containers-storage-unmount.md b/docs/containers-storage-unmount.md
index dcafd222a..de56fced9 100644
--- a/docs/containers-storage-unmount.md
+++ b/docs/containers-storage-unmount.md
@@ -1,17 +1,17 @@
-## oci-storage-unmount 1 "August 2016"
+## containers-storage-unmount 1 "August 2016"
 
 ## NAME
-oci-storage unmount - Unmount a layer or a container's layer
+containers-storage unmount - Unmount a layer or a container's layer
 
 ## SYNOPSIS
-**oci-storage** **unmount** *layerOrContainerMountpointOrNameOrID*
+**containers-storage** **unmount** *layerOrContainerMountpointOrNameOrID*
 
 ## DESCRIPTION
 Unmounts a layer or a container's layer from the host's filesystem.
 
 ## EXAMPLE
-**oci-storage unmount my-container**
-**oci-storage unmount /var/lib/oci-storage/mounts/my-container**
+**containers-storage unmount my-container**
+**containers-storage unmount /var/lib/containers/storage/mounts/my-container**
 
 ## SEE ALSO
-oci-storage-mount(1)
+containers-storage-mount(1)
diff --git a/docs/containers-storage-version.md b/docs/containers-storage-version.md
index 07c8eb687..8bc4147a1 100644
--- a/docs/containers-storage-version.md
+++ b/docs/containers-storage-version.md
@@ -1,16 +1,16 @@
-## oci-storage-version 1 "August 2016"
+## containers-storage-version 1 "August 2016"
 
 ## NAME
-oci-storage version - Output version information about the storage library
+containers-storage version - Output version information about the storage library
 
 ## SYNOPSIS
-**oci-storage** **version**
+**containers-storage** **version**
 
 ## DESCRIPTION
-Outputs version information about the storage library and *oci-storage*.
+Outputs version information about the storage library and *containers-storage*.
 
 ## EXAMPLE
-**oci-storage version**
+**containers-storage version**
 
 ## SEE ALSO
-oci-storage-status(1)
+containers-storage-status(1)
diff --git a/docs/containers-storage-wipe.md b/docs/containers-storage-wipe.md
index a0aee6f3c..85b2edef4 100644
--- a/docs/containers-storage-wipe.md
+++ b/docs/containers-storage-wipe.md
@@ -1,14 +1,14 @@
-## oci-storage-wipe 1 "August 2016"
+## containers-storage-wipe 1 "August 2016"
 
 ## NAME
-oci-storage wipe - Delete all containers, images, and layers
+containers-storage wipe - Delete all containers, images, and layers
 
 ## SYNOPSIS
-**oci-storage** **wipe**
+**containers-storage** **wipe**
 
 ## DESCRIPTION
 Deletes all known containers, images, and layers.  Depending on your use case,
 use with caution or abandon.
 
 ## EXAMPLE
-**oci-storage wipe**
+**containers-storage wipe**
diff --git a/docs/containers-storage.md b/docs/containers-storage.md
index 3b67f2d95..1a5c1ea69 100644
--- a/docs/containers-storage.md
+++ b/docs/containers-storage.md
@@ -1,13 +1,13 @@
-## oci-storage 1 "August 2016"
+## containers-storage 1 "August 2016"
 
 ## NAME
-oci-storage - Manage layer/image/container storage
+containers-storage - Manage layer/image/container storage
 
 ## SYNOPSIS
-**oci-storage** [**subcommand**] [**--help**]
+**containers-storage** [**subcommand**] [**--help**]
 
 ## DESCRIPTION
-The *oci-storage* command is a front-end for the *containers/storage* library.
+The *containers-storage* command is a front-end for the *containers/storage* library.
 While it can be used to manage storage for filesystem layers, images, and
 containers directly, its main use cases are centered around troubleshooting and
 querying the state of storage which is being managed by other processes.
@@ -37,7 +37,7 @@ This ensures that changes to the contents of a *container*'s layer do not
 affect other *images* or *layers*, so they are considered writeable.
 
 All of *layers*, *images*, and *containers* can have metadata which
-*oci-storage* manages attached to them.  Generally this metadata is not
+*containers-storage* manages attached to them.  Generally this metadata is not
 expected to be large, as it is cached in memory.
 
 *Images* and *containers* can also have arbitrarily-named data items attached
@@ -51,40 +51,40 @@ from the *image*.  It is also expected that a *container*'s run-time
 configuration will be stored as data items.
 
 ## SUB-COMMANDS
-The *oci-storage* command's features are broken down into several subcommands:
- **oci-storage add-names(1)**           Add layer, image, or container name or names
- **oci-storage applydiff(1)**           Apply a diff to a layer
- **oci-storage changes(1)**             Compare two layers
- **oci-storage container(1)**           Examine a container
- **oci-storage containers(1)**          List containers
- **oci-storage create-container(1)**    Create a new container from an image
- **oci-storage create-image(1)**        Create a new image using layers
- **oci-storage create-layer(1)**        Create a new layer
- **oci-storage delete(1)**              Delete a layer or image or container, with no safety checks
- **oci-storage delete-container(1)**    Delete a container, with safety checks
- **oci-storage delete-image(1)**        Delete an image, with safety checks
- **oci-storage delete-layer(1)**        Delete a layer, with safety checks
- **oci-storage diff(1)**                Compare two layers
- **oci-storage diffsize(1)**            Compare two layers
- **oci-storage exists(1)**              Check if a layer or image or container exists
- **oci-storage get-container-data(1)**  Get data that is attached to a container
- **oci-storage get-image-data(1)**      Get data that is attached to an image
- **oci-storage image(1)**               Examine an image
- **oci-storage images(1)**              List images
- **oci-storage layers(1)**              List layers
- **oci-storage list-container-data(1)** List data items that are attached to a container
- **oci-storage list-image-data(1)**     List data items that are attached to an image
- **oci-storage metadata(1)**            Retrieve layer, image, or container metadata
- **oci-storage mount(1)**               Mount a layer or container
- **oci-storage set-container-data(1)**  Set data that is attached to a container
- **oci-storage set-image-data(1)**      Set data that is attached to an image
- **oci-storage set-metadata(1)**        Set layer, image, or container metadata
- **oci-storage set-names(1)**           Set layer, image, or container name or names
- **oci-storage shutdown(1)**            Shut down graph driver
- **oci-storage status(1)**              Check on graph driver status
- **oci-storage unmount(1)**             Unmount a layer or container
- **oci-storage version(1)**             Return oci-storage version information
- **oci-storage wipe(1)**                Wipe all layers, images, and containers
+The *containers-storage* command's features are broken down into several subcommands:
+ **containers-storage add-names(1)**           Add layer, image, or container name or names
+ **containers-storage applydiff(1)**           Apply a diff to a layer
+ **containers-storage changes(1)**             Compare two layers
+ **containers-storage container(1)**           Examine a container
+ **containers-storage containers(1)**          List containers
+ **containers-storage create-container(1)**    Create a new container from an image
+ **containers-storage create-image(1)**        Create a new image using layers
+ **containers-storage create-layer(1)**        Create a new layer
+ **containers-storage delete(1)**              Delete a layer or image or container, with no safety checks
+ **containers-storage delete-container(1)**    Delete a container, with safety checks
+ **containers-storage delete-image(1)**        Delete an image, with safety checks
+ **containers-storage delete-layer(1)**        Delete a layer, with safety checks
+ **containers-storage diff(1)**                Compare two layers
+ **containers-storage diffsize(1)**            Compare two layers
+ **containers-storage exists(1)**              Check if a layer or image or container exists
+ **containers-storage get-container-data(1)**  Get data that is attached to a container
+ **containers-storage get-image-data(1)**      Get data that is attached to an image
+ **containers-storage image(1)**               Examine an image
+ **containers-storage images(1)**              List images
+ **containers-storage layers(1)**              List layers
+ **containers-storage list-container-data(1)** List data items that are attached to a container
+ **containers-storage list-image-data(1)**     List data items that are attached to an image
+ **containers-storage metadata(1)**            Retrieve layer, image, or container metadata
+ **containers-storage mount(1)**               Mount a layer or container
+ **containers-storage set-container-data(1)**  Set data that is attached to a container
+ **containers-storage set-image-data(1)**      Set data that is attached to an image
+ **containers-storage set-metadata(1)**        Set layer, image, or container metadata
+ **containers-storage set-names(1)**           Set layer, image, or container name or names
+ **containers-storage shutdown(1)**            Shut down graph driver
+ **containers-storage status(1)**              Check on graph driver status
+ **containers-storage unmount(1)**             Unmount a layer or container
+ **containers-storage version(1)**             Return containers-storage version information
+ **containers-storage wipe(1)**                Wipe all layers, images, and containers
 
 ## OPTIONS
 **--help**
@@ -96,15 +96,15 @@ provide information about that command.
 
 Increases the amount of debugging information which is printed.
 
-**--graph, -g=/var/lib/oci-storage**
+**--graph, -g=/var/lib/containers/storage**
 
 Overrides the root of the storage tree, used for storing layer contents and
 information about layers, images, and containers.
 
-**--run, -R=/var/run/oci-storage**
+**--run, -R=/var/run/containers/storage**
 
 Overrides the root of the runtime state tree, currently used mainly for noting
-the location where a given layer is mounted (see **oci-storage mount**) so that
+the location where a given layer is mounted (see **containers-storage mount**) so that
 it can be unmounted by path name as an alternative to unmounting by ID or name.
 
 **--storage-driver, -s**
@@ -122,7 +122,7 @@ comma-separated list and used instead.  If the storage tree has previously been
 initialized, these need not be provided.
 
 ## EXAMPLES
-**oci-storage layers -t**
+**containers-storage layers -t**
 
 ## BUGS
 This is still a work in progress, so some functionality may not yet be
diff --git a/pkg/plugins/discovery.go b/pkg/plugins/discovery.go
index fdff71cfe..4cb5a1a3a 100644
--- a/pkg/plugins/discovery.go
+++ b/pkg/plugins/discovery.go
@@ -15,8 +15,8 @@ import (
 var (
 	// ErrNotFound plugin not found
 	ErrNotFound = errors.New("plugin not found")
-	socketsPath = "/run/oci-storage/plugins"
-	specsPaths  = []string{"/etc/oci-storage/plugins", "/usr/lib/oci-storage/plugins"}
+	socketsPath = "/run/containers/storage/plugins"
+	specsPaths  = []string{"/etc/containers/storage/plugins", "/usr/lib/containers/storage/plugins"}
 )
 
 // localRegistry defines a registry that is local (using unix socket).
diff --git a/pkg/plugins/discovery_test.go b/pkg/plugins/discovery_test.go
index 5e1b0b33e..b8fa38c1d 100644
--- a/pkg/plugins/discovery_test.go
+++ b/pkg/plugins/discovery_test.go
@@ -33,8 +33,8 @@ func TestFileSpecPlugin(t *testing.T) {
 		fail bool
 	}{
 		// TODO Windows: Factor out the unix:// variants.
-		{filepath.Join(tmpdir, "echo.spec"), "echo", "unix://var/lib/oci-storage/plugins/echo.sock", false},
-		{filepath.Join(tmpdir, "echo", "echo.spec"), "echo", "unix://var/lib/oci-storage/plugins/echo.sock", false},
+		{filepath.Join(tmpdir, "echo.spec"), "echo", "unix://var/lib/containers/storage/plugins/echo.sock", false},
+		{filepath.Join(tmpdir, "echo", "echo.spec"), "echo", "unix://var/lib/containers/storage/plugins/echo.sock", false},
 		{filepath.Join(tmpdir, "foo.spec"), "foo", "tcp://localhost:8080", false},
 		{filepath.Join(tmpdir, "foo", "foo.spec"), "foo", "tcp://localhost:8080", false},
 		{filepath.Join(tmpdir, "bar.spec"), "bar", "localhost:8080", true}, // unknown transport
@@ -79,11 +79,11 @@ func TestFileJSONSpecPlugin(t *testing.T) {
 	p := filepath.Join(tmpdir, "example.json")
 	spec := `{
   "Name": "plugin-example",
-  "Addr": "https://example.com/oci-storage/plugin",
+  "Addr": "https://example.com/containers-storage/plugin",
   "TLSConfig": {
-    "CAFile": "/usr/shared/oci-storage/certs/example-ca.pem",
-    "CertFile": "/usr/shared/oci-storage/certs/example-cert.pem",
-    "KeyFile": "/usr/shared/oci-storage/certs/example-key.pem"
+    "CAFile": "/usr/shared/containers-storage/certs/example-ca.pem",
+    "CertFile": "/usr/shared/containers-storage/certs/example-cert.pem",
+    "KeyFile": "/usr/shared/containers-storage/certs/example-key.pem"
 	}
 }`
 
@@ -101,19 +101,19 @@ func TestFileJSONSpecPlugin(t *testing.T) {
 		t.Fatalf("Expected plugin `plugin-example`, got %s\n", plugin.Name)
 	}
 
-	if plugin.Addr != "https://example.com/oci-storage/plugin" {
-		t.Fatalf("Expected plugin addr `https://example.com/oci-storage/plugin`, got %s\n", plugin.Addr)
+	if plugin.Addr != "https://example.com/containers-storage/plugin" {
+		t.Fatalf("Expected plugin addr `https://example.com/containers-storage/plugin`, got %s\n", plugin.Addr)
 	}
 
-	if plugin.TLSConfig.CAFile != "/usr/shared/oci-storage/certs/example-ca.pem" {
-		t.Fatalf("Expected plugin CA `/usr/shared/oci-storage/certs/example-ca.pem`, got %s\n", plugin.TLSConfig.CAFile)
+	if plugin.TLSConfig.CAFile != "/usr/shared/containers-storage/certs/example-ca.pem" {
+		t.Fatalf("Expected plugin CA `/usr/shared/containers-storage/certs/example-ca.pem`, got %s\n", plugin.TLSConfig.CAFile)
 	}
 
-	if plugin.TLSConfig.CertFile != "/usr/shared/oci-storage/certs/example-cert.pem" {
-		t.Fatalf("Expected plugin Certificate `/usr/shared/oci-storage/certs/example-cert.pem`, got %s\n", plugin.TLSConfig.CertFile)
+	if plugin.TLSConfig.CertFile != "/usr/shared/containers-storage/certs/example-cert.pem" {
+		t.Fatalf("Expected plugin Certificate `/usr/shared/containers-storage/certs/example-cert.pem`, got %s\n", plugin.TLSConfig.CertFile)
 	}
 
-	if plugin.TLSConfig.KeyFile != "/usr/shared/oci-storage/certs/example-key.pem" {
-		t.Fatalf("Expected plugin Key `/usr/shared/oci-storage/certs/example-key.pem`, got %s\n", plugin.TLSConfig.KeyFile)
+	if plugin.TLSConfig.KeyFile != "/usr/shared/containers-storage/certs/example-key.pem" {
+		t.Fatalf("Expected plugin Key `/usr/shared/containers-storage/certs/example-key.pem`, got %s\n", plugin.TLSConfig.KeyFile)
 	}
 }
diff --git a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
index 9cf8aecf0..f6662c4b8 100644
--- a/pkg/plugins/plugins.go
+++ b/pkg/plugins/plugins.go
@@ -3,10 +3,11 @@
 //
 // Storage discovers plugins by looking for them in the plugin directory whenever
 // a user or container tries to use one by name. UNIX domain socket files must
-// be located under /run/oci-storage/plugins, whereas spec files can be located
-// either under /etc/oci-storage/plugins or /usr/lib/oci-storage/plugins. This
-// is handled by the Registry interface, which lets you list all plugins or get
-// a plugin by its name if it exists.
+// be located under /run/containers/storage/plugins, whereas spec files can be
+// located either under /etc/containers/storage/plugins or
+// /usr/lib/containers/storage/plugins. This is handled by the Registry
+// interface, which lets you list all plugins or get a plugin by its name if it
+// exists.
 //
 // The plugins need to implement an HTTP server and bind this to the UNIX socket
 // or the address specified in the spec files.
diff --git a/tests/helpers.bash b/tests/helpers.bash
index c60489e15..7f54a28c3 100755
--- a/tests/helpers.bash
+++ b/tests/helpers.bash
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-STORAGE_BINARY=${STORAGE_BINARY:-$(dirname ${BASH_SOURCE})/../oci-storage}
+STORAGE_BINARY=${STORAGE_BINARY:-$(dirname ${BASH_SOURCE})/../containers-storage}
 TESTSDIR=${TESTSDIR:-$(dirname ${BASH_SOURCE})}
 
 function setup() {