diff --git a/api-ref/source/v2/samples/version-show-response.json b/api-ref/source/v2/samples/version-show-response.json
index 04458b75527..811a3e80eb3 100644
--- a/api-ref/source/v2/samples/version-show-response.json
+++ b/api-ref/source/v2/samples/version-show-response.json
@@ -1,29 +1,36 @@
 {
-    "version": {
-        "status": "CURRENT",
-        "updated": "2012-01-04T11:33:21Z",
-        "media-types": [
-            {
-                "base": "application/json",
-                "type": "application/vnd.openstack.volume+json;version=1"
-            }
-        ],
-        "id": "v1.0",
-        "links": [
-            {
-                "href": "http://23.253.228.211:8776/v1/",
-                "rel": "self"
-            },
-            {
-                "href": "http://jorgew.github.com/block-storage-api/content/os-block-storage-1.0.pdf",
-                "type": "application/pdf",
-                "rel": "describedby"
-            },
-            {
-                "href": "http://docs.rackspacecloud.com/servers/api/v1.1/application.wadl",
-                "type": "application/vnd.sun.wadl+xml",
-                "rel": "describedby"
-            }
-        ]
-    }
+    "choices": [
+        {
+            "status": "SUPPORTED",
+            "media-types": [
+                {
+                    "base": "application/json",
+                    "type": "application/vnd.openstack.volume+json;version=1"
+                }
+            ],
+            "id": "v1.0",
+            "links": [
+                {
+                    "href": "http://23.253.248.171:8776/v1/v2.json",
+                    "rel": "self"
+                }
+            ]
+        },
+        {
+            "status": "CURRENT",
+            "media-types": [
+                {
+                    "base": "application/json",
+                    "type": "application/vnd.openstack.volume+json;version=1"
+                }
+            ],
+            "id": "v2.0",
+            "links": [
+                {
+                    "href": "http://23.253.248.171:8776/v2/v2.json",
+                    "rel": "self"
+                }
+            ]
+        }
+    ]
 }
diff --git a/api-ref/source/v2/samples/version-v2-show-response.json b/api-ref/source/v2/samples/version-v2-show-response.json
deleted file mode 100644
index 811a3e80eb3..00000000000
--- a/api-ref/source/v2/samples/version-v2-show-response.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "choices": [
-        {
-            "status": "SUPPORTED",
-            "media-types": [
-                {
-                    "base": "application/json",
-                    "type": "application/vnd.openstack.volume+json;version=1"
-                }
-            ],
-            "id": "v1.0",
-            "links": [
-                {
-                    "href": "http://23.253.248.171:8776/v1/v2.json",
-                    "rel": "self"
-                }
-            ]
-        },
-        {
-            "status": "CURRENT",
-            "media-types": [
-                {
-                    "base": "application/json",
-                    "type": "application/vnd.openstack.volume+json;version=1"
-                }
-            ],
-            "id": "v2.0",
-            "links": [
-                {
-                    "href": "http://23.253.248.171:8776/v2/v2.json",
-                    "rel": "self"
-                }
-            ]
-        }
-    ]
-}
diff --git a/api-ref/source/v2/volumes-v2-versions.inc b/api-ref/source/v2/volumes-v2-versions.inc
index 27fb0ebb3d9..825fe975636 100644
--- a/api-ref/source/v2/volumes-v2-versions.inc
+++ b/api-ref/source/v2/volumes-v2-versions.inc
@@ -34,7 +34,7 @@ Response Parameters
 Response Example
 ----------------
 
-.. literalinclude:: ./samples/version-v2-show-response.json
+.. literalinclude:: ./samples/version-show-response.json
    :language: javascript
 
 
diff --git a/api-ref/source/v3/samples/version-show-response.json b/api-ref/source/v3/samples/version-show-response.json
index 04458b75527..1103ad0544c 100644
--- a/api-ref/source/v3/samples/version-show-response.json
+++ b/api-ref/source/v3/samples/version-show-response.json
@@ -1,29 +1,76 @@
 {
-    "version": {
-        "status": "CURRENT",
-        "updated": "2012-01-04T11:33:21Z",
-        "media-types": [
-            {
-                "base": "application/json",
-                "type": "application/vnd.openstack.volume+json;version=1"
-            }
-        ],
-        "id": "v1.0",
-        "links": [
-            {
-                "href": "http://23.253.228.211:8776/v1/",
-                "rel": "self"
-            },
-            {
-                "href": "http://jorgew.github.com/block-storage-api/content/os-block-storage-1.0.pdf",
-                "type": "application/pdf",
-                "rel": "describedby"
-            },
-            {
-                "href": "http://docs.rackspacecloud.com/servers/api/v1.1/application.wadl",
-                "type": "application/vnd.sun.wadl+xml",
-                "rel": "describedby"
-            }
-        ]
-    }
+    "versions": [
+        {
+            "id": "v1.0",
+            "links": [
+                {
+                    "href": "http://docs.openstack.org/",
+                    "rel": "describedby",
+                    "type": "text/html"
+                },
+                {
+                    "href": "http://23.253.248.171:8776/v1/",
+                    "rel": "self"
+                }
+            ],
+            "media-types": [
+                {
+                    "base": "application/json",
+                    "type": "application/vnd.openstack.volume+json;version=1"
+                }
+            ],
+            "min_version": "",
+            "status": "DEPRECATED",
+            "updated": "2014-06-28T12:20:21Z",
+            "version": ""
+        },
+        {
+            "id": "v2.0",
+            "links": [
+                {
+                    "href": "http://docs.openstack.org/",
+                    "rel": "describedby",
+                    "type": "text/html"
+                },
+                {
+                    "href": "http://23.253.248.171:8776/v2/",
+                    "rel": "self"
+                }
+            ],
+            "media-types": [
+                {
+                    "base": "application/json",
+                    "type": "application/vnd.openstack.volume+json;version=1"
+                }
+            ],
+            "min_version": "",
+            "status": "SUPPORTED",
+            "updated": "2014-06-28T12:20:21Z",
+            "version": ""
+        },
+        {
+            "id": "v3.0",
+            "links": [
+                {
+                    "href": "http://docs.openstack.org/",
+                    "rel": "describedby",
+                    "type": "text/html"
+                },
+                {
+                    "href": "http://23.253.248.171:8776/v3/",
+                    "rel": "self"
+                }
+            ],
+            "media-types": [
+                {
+                    "base": "application/json",
+                    "type": "application/vnd.openstack.volume+json;version=1"
+                }
+            ],
+            "min_version": "3.0",
+            "status": "CURRENT",
+            "updated": "2016-02-08T12:20:21Z",
+            "version": "3.0"
+        }
+    ]
 }
diff --git a/api-ref/source/v3/samples/version-v2-show-response.json b/api-ref/source/v3/samples/version-v2-show-response.json
deleted file mode 100644
index 811a3e80eb3..00000000000
--- a/api-ref/source/v3/samples/version-v2-show-response.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "choices": [
-        {
-            "status": "SUPPORTED",
-            "media-types": [
-                {
-                    "base": "application/json",
-                    "type": "application/vnd.openstack.volume+json;version=1"
-                }
-            ],
-            "id": "v1.0",
-            "links": [
-                {
-                    "href": "http://23.253.248.171:8776/v1/v2.json",
-                    "rel": "self"
-                }
-            ]
-        },
-        {
-            "status": "CURRENT",
-            "media-types": [
-                {
-                    "base": "application/json",
-                    "type": "application/vnd.openstack.volume+json;version=1"
-                }
-            ],
-            "id": "v2.0",
-            "links": [
-                {
-                    "href": "http://23.253.248.171:8776/v2/v2.json",
-                    "rel": "self"
-                }
-            ]
-        }
-    ]
-}
diff --git a/api-ref/source/v3/samples/version-v3-show-response.json b/api-ref/source/v3/samples/version-v3-show-response.json
deleted file mode 100644
index 1103ad0544c..00000000000
--- a/api-ref/source/v3/samples/version-v3-show-response.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "versions": [
-        {
-            "id": "v1.0",
-            "links": [
-                {
-                    "href": "http://docs.openstack.org/",
-                    "rel": "describedby",
-                    "type": "text/html"
-                },
-                {
-                    "href": "http://23.253.248.171:8776/v1/",
-                    "rel": "self"
-                }
-            ],
-            "media-types": [
-                {
-                    "base": "application/json",
-                    "type": "application/vnd.openstack.volume+json;version=1"
-                }
-            ],
-            "min_version": "",
-            "status": "DEPRECATED",
-            "updated": "2014-06-28T12:20:21Z",
-            "version": ""
-        },
-        {
-            "id": "v2.0",
-            "links": [
-                {
-                    "href": "http://docs.openstack.org/",
-                    "rel": "describedby",
-                    "type": "text/html"
-                },
-                {
-                    "href": "http://23.253.248.171:8776/v2/",
-                    "rel": "self"
-                }
-            ],
-            "media-types": [
-                {
-                    "base": "application/json",
-                    "type": "application/vnd.openstack.volume+json;version=1"
-                }
-            ],
-            "min_version": "",
-            "status": "SUPPORTED",
-            "updated": "2014-06-28T12:20:21Z",
-            "version": ""
-        },
-        {
-            "id": "v3.0",
-            "links": [
-                {
-                    "href": "http://docs.openstack.org/",
-                    "rel": "describedby",
-                    "type": "text/html"
-                },
-                {
-                    "href": "http://23.253.248.171:8776/v3/",
-                    "rel": "self"
-                }
-            ],
-            "media-types": [
-                {
-                    "base": "application/json",
-                    "type": "application/vnd.openstack.volume+json;version=1"
-                }
-            ],
-            "min_version": "3.0",
-            "status": "CURRENT",
-            "updated": "2016-02-08T12:20:21Z",
-            "version": "3.0"
-        }
-    ]
-}
diff --git a/api-ref/source/v3/volumes-v3-versions.inc b/api-ref/source/v3/volumes-v3-versions.inc
index 38708695bfc..2f8a30ea9d9 100644
--- a/api-ref/source/v3/volumes-v3-versions.inc
+++ b/api-ref/source/v3/volumes-v3-versions.inc
@@ -36,7 +36,7 @@ Response Parameters
 Response Example
 ----------------
 
-.. literalinclude:: ./samples/version-v3-show-response.json
+.. literalinclude:: ./samples/version-show-response.json
    :language: javascript