diff --git a/docs/extend/plugin_api.md b/docs/extend/plugin_api.md
index a0b0a7367552..bc4b06ee5f58 100644
--- a/docs/extend/plugin_api.md
+++ b/docs/extend/plugin_api.md
@@ -45,12 +45,13 @@ spec files can be located either under `/etc/docker/plugins` or `/usr/lib/docker
 
 The name of the file (excluding the extension) determines the plugin name.
 
-For example, the `flocker` plugin might create a Unix socket at
-`/run/docker/plugins/flocker.sock`.
+For example, a plugin named `VolumeDriver` might create a Unix socket at
+`/run/docker/plugins/VolumeDriver.sock`.
 
 You can define each plugin into a separated subdirectory if you want to isolate definitions from each other.
-For example, you can create the `flocker` socket under `/run/docker/plugins/flocker/flocker.sock` and only
-mount `/run/docker/plugins/flocker` inside the `flocker` container.
+For example, you can create the `VolumeDriver` socket under `/run/docker/plugins/VolumeDriver/VolumeDriver.sock` and only
+mount `/run/docker/plugins/VolumeDriver` inside the `VolumeDriver` container.
+
 
 Docker always searches for Unix sockets in `/run/docker/plugins` first. It checks for spec or json files under
 `/etc/docker/plugins` and `/usr/lib/docker/plugins` if the socket doesn't exist. The directory scan stops as
diff --git a/docs/extend/plugins_volume.md b/docs/extend/plugins_volume.md
index 8da7deb742c9..82df2a961792 100644
--- a/docs/extend/plugins_volume.md
+++ b/docs/extend/plugins_volume.md
@@ -45,9 +45,9 @@ accepts a volume name and path on the host, and the `--volume-driver` flag
 accepts a driver type.
 
 ```console
-$ docker volume create --driver=flocker volumename
+$ docker volume create --driver=`VolumeDriver` `VolumeName`
 
-$ docker container run -it --volume volumename:/data busybox sh
+$ docker container run -it --volume `VolumeName`:/data busybox sh
 ```
 
 ### `--volume`
@@ -61,11 +61,9 @@ separated by a colon (`:`) character.
 - The `Mountpoint` is the path on the host (v1) or in the plugin (v2) where the
   volume has been made available.
 
-### `volumedriver`
+### `VolumeDriver`
 
-Specifying a `volumedriver` in conjunction with a `volumename` allows you to
-use plugins such as [Flocker](https://github.com/ScatterHQ/flocker) to manage
-volumes external to a single host, such as those on EBS.
+Specifying a `VolumeDriver` in conjunction with a `VolumeName` allows you to use plugins to manage volumes.
 
 ## Create a VolumeDriver