diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-add-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-add-post-req.json
deleted file mode 100644
index a921e03a0..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-add-post-req.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "addSecurityGroup": {
-        "name": "test"
-    }
-}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-post-req.json
index 25972a659..a13f327fa 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-post-req.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-post-req.json
@@ -1,6 +1,6 @@
 {
     "security_group": {
         "name": "test",
-        "description": "description"
+        "description": "test"
     }
 }
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-remove-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-remove-post-req.json
deleted file mode 100644
index f328976ad..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-remove-post-req.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "removeSecurityGroup": {
-        "name": "test"
-    }
-}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-create-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-create-resp.json
index 34c00403c..9cd088ef3 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-create-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-create-resp.json
@@ -1,8 +1,8 @@
 {
     "security_group": {
-        "description": "default",
+        "description": "test",
         "id": "de3ff110-46b2-4ace-bb76-a2e1ed741b95",
-        "name": "default",
+        "name": "test",
         "rules": [],
         "tenant_id": "openstack"
     }
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/server-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/server-get-resp.json
deleted file mode 100644
index 7f54b619e..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/server-get-resp.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "server": {
-        "addresses": {
-            "private": [
-                {
-                    "addr": "192.168.0.3",
-                    "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
-                    "OS-EXT-IPS:type": "fixed",
-                    "version": 4
-                }
-            ]
-        },
-        "created": "2014-09-18T10:13:33Z",
-        "flavor": {
-            "id": "1",
-            "links": [
-                {
-                    "href": "http://openstack.example.com/flavors/1",
-                    "rel": "bookmark"
-                }
-            ]
-        },
-        "hostId": "24451d49cba30e60300a5b928ebc93a2d0b43c084a677b0a14fd678b",
-        "id": "b08eb8d8-db43-44fb-bd89-dfe3302b84ef",
-        "image": {
-            "id": "70a599e0-31e7-49b7-b260-868f441e862b",
-            "links": [
-                {
-                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
-                    "rel": "bookmark"
-                }
-            ]
-        },
-        "key_name": null,
-        "links": [
-            {
-                "href": "http://openstack.example.com/v2.1/servers/b08eb8d8-db43-44fb-bd89-dfe3302b84ef",
-                "rel": "self"
-            },
-            {
-                "href": "http://openstack.example.com/servers/b08eb8d8-db43-44fb-bd89-dfe3302b84ef",
-                "rel": "bookmark"
-            }
-        ],
-        "metadata": {
-            "My Server Name": "Apache1"
-        },
-        "name": "new-server-test",
-        "progress": 0,
-        "security_groups": [
-            {
-                "name": "test"
-            }
-        ],
-        "status": "ACTIVE",
-        "tenant_id": "openstack",
-        "updated": "2014-09-18T10:13:34Z",
-        "user_id": "fake"
-    }
-}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/server-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/server-post-req.json
deleted file mode 100644
index 9385cb8ad..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/server-post-req.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "server": {
-        "name": "new-server-test",
-        "imageRef": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavorRef": "http://openstack.example.com/openstack/flavors/1",
-        "metadata": {
-            "My Server Name": "Apache1"
-        },
-        "security_groups": [
-            {
-                "name": "test"
-            }
-        ]
-    }
-}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/server-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/server-post-resp.json
deleted file mode 100644
index 66cf612e7..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/server-post-resp.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "server": {
-        "adminPass": "xhS2khTdkRkT",
-        "id": "60874907-c72b-4a01-805d-54c992510e47",
-        "links": [
-            {
-                "href": "http://openstack.example.com/v2.1/servers/60874907-c72b-4a01-805d-54c992510e47",
-                "rel": "self"
-            },
-            {
-                "href": "http://openstack.example.com/servers/60874907-c72b-4a01-805d-54c992510e47",
-                "rel": "bookmark"
-            }
-        ],
-        "security_groups": [
-            {
-                "name": "test"
-            }
-        ]
-    }
-}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/servers-detail-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/servers-detail-resp.json
deleted file mode 100644
index a9a42fed4..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/servers-detail-resp.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "servers": [
-        {
-            "addresses": {
-                "private": [
-                    {
-                        "addr": "192.168.0.3",
-                        "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
-                        "OS-EXT-IPS:type": "fixed",
-                        "version": 4
-                    }
-                ]
-            },
-            "created": "2014-09-18T10:13:33Z",
-            "flavor": {
-                "id": "1",
-                "links": [
-                    {
-                        "href": "http://openstack.example.com/flavors/1",
-                        "rel": "bookmark"
-                    }
-                ]
-            },
-            "hostId": "2ab794bccd321fe64f9f8b679266aa2c96825f467434bbdd71b09b1d",
-            "id": "d182742c-6f20-479c-8e32-f79f9c9df6e3",
-            "image": {
-                "id": "70a599e0-31e7-49b7-b260-868f441e862b",
-                "links": [
-                    {
-                        "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
-                        "rel": "bookmark"
-                    }
-                ]
-            },
-            "key_name": null,
-            "links": [
-                {
-                    "href": "http://openstack.example.com/v2.1/servers/d182742c-6f20-479c-8e32-f79f9c9df6e3",
-                    "rel": "self"
-                },
-                {
-                    "href": "http://openstack.example.com/servers/d182742c-6f20-479c-8e32-f79f9c9df6e3",
-                    "rel": "bookmark"
-                }
-            ],
-            "metadata": {
-                "My Server Name": "Apache1"
-            },
-            "name": "new-server-test",
-            "progress": 0,
-            "security_groups": [
-                {
-                    "name": "test"
-                }
-            ],
-            "status": "ACTIVE",
-            "tenant_id": "openstack",
-            "updated": "2014-09-18T10:13:34Z",
-            "user_id": "fake"
-        }
-    ]
-}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-security-groups-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-security-groups-v2.1.wadl
index 6e54bc48a..83c35b266 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-security-groups-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-security-groups-v2.1.wadl
@@ -88,12 +88,12 @@
       <request>
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Create security group: JSON request">
-               <xsdxt:code href="../api_samples/os-security-groups/security-group-add-post-req.json" />
+               <xsdxt:code href="../api_samples/os-security-groups/security-group-post-req.json" />
             </wadl:doc>
-            <param name="addSecurityGroup" style="plain" type="xsd:string" required="true">
+            <param name="security_group" style="plain" type="xsd:string" required="true">
                <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Add security group">
                   <para>
-                     Specify the <code>addSecurityGroup</code> action in the
+                     Specify the <code>security_group</code> action in the
                      request body.
                   </para>
                </wadl:doc>
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-group-add-post-req.json b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-group-add-post-req.json
deleted file mode 100644
index a921e03a0..000000000
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-group-add-post-req.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "addSecurityGroup": {
-        "name": "test"
-    }
-}
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-group-post-req.json b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-group-post-req.json
index 25972a659..a13f327fa 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-group-post-req.json
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-group-post-req.json
@@ -1,6 +1,6 @@
 {
     "security_group": {
         "name": "test",
-        "description": "description"
+        "description": "test"
     }
 }
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-group-remove-post-req.json b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-group-remove-post-req.json
deleted file mode 100644
index f328976ad..000000000
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-group-remove-post-req.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "removeSecurityGroup": {
-        "name": "test"
-    }
-}
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-create-resp.json b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-create-resp.json
index d86fb66e8..9cd088ef3 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-create-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-create-resp.json
@@ -1,7 +1,7 @@
 {
     "security_group": {
-        "description": "description",
-        "id": "a5defa86-79b3-4b98-bde6-baf139a819c9",
+        "description": "test",
+        "id": "de3ff110-46b2-4ace-bb76-a2e1ed741b95",
         "name": "test",
         "rules": [],
         "tenant_id": "openstack"
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-get-resp.json b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-get-resp.json
index b9da4592f..34c00403c 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-get-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-get-resp.json
@@ -1,7 +1,7 @@
 {
     "security_group": {
         "description": "default",
-        "id": "a5defa86-79b3-4b98-bde6-baf139a819c9",
+        "id": "de3ff110-46b2-4ace-bb76-a2e1ed741b95",
         "name": "default",
         "rules": [],
         "tenant_id": "openstack"
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-list-get-resp.json b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-list-get-resp.json
index 0c0b8da21..9c315e983 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-list-get-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/security-groups-list-get-resp.json
@@ -2,7 +2,7 @@
     "security_groups": [
         {
             "description": "default",
-            "id": "a5defa86-79b3-4b98-bde6-baf139a819c9",
+            "id": "3fb26eb3-581b-4420-9963-b0879a026506",
             "name": "default",
             "rules": [],
             "tenant_id": "openstack"
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/server-post-req.json b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/server-post-req.json
deleted file mode 100644
index f0bd48648..000000000
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/server-post-req.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "server": {
-        "name": "new-server-test",
-        "imageRef": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavorRef": "http://openstack.example.com/openstack/flavors/1",
-        "metadata": {
-            "My Server Name": "Apache1"
-        },
-        "personality": [
-            {
-                "path": "/etc/banner.txt",
-                "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
-    }
-}
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/server-post-resp.json b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/server-post-resp.json
deleted file mode 100644
index 23286886d..000000000
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/server-post-resp.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "server": {
-        "adminPass": "QmKpgBk7izBM",
-        "id": "3ad37a3a-d5c4-40ab-9bff-af5b66a0e35b",
-        "links": [
-            {
-                "href": "http://openstack.example.com/v2/openstack/servers/3ad37a3a-d5c4-40ab-9bff-af5b66a0e35b",
-                "rel": "self"
-            },
-            {
-                "href": "http://openstack.example.com/openstack/servers/3ad37a3a-d5c4-40ab-9bff-af5b66a0e35b",
-                "rel": "bookmark"
-            }
-        ],
-        "security_groups": [
-            {
-                "name": "default"
-            }
-        ]
-    }
-}
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/server-security-groups-list-resp.json b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/server-security-groups-list-resp.json
index 1771f2dff..9c315e983 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/server-security-groups-list-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-security-groups/server-security-groups-list-resp.json
@@ -2,7 +2,7 @@
     "security_groups": [
         {
             "description": "default",
-            "id": 1,
+            "id": "3fb26eb3-581b-4420-9963-b0879a026506",
             "name": "default",
             "rules": [],
             "tenant_id": "openstack"
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/server-action-associatesecgroup.json b/api-ref/src/wadls/compute-api/src/v2/api_samples/server-action-associatesecgroup.json
index 91964f4b2..ed3a61c40 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/server-action-associatesecgroup.json
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/server-action-associatesecgroup.json
@@ -1,5 +1,5 @@
 {
-    "addSecurityGroup": {
+    "security_group": {
         "name": "secgroup_name"
     }
 }
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-security-groups.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-security-groups.wadl
index 6f3b05149..9392631c4 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-security-groups.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-security-groups.wadl
@@ -154,12 +154,12 @@
       <request>
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Create security group: JSON request">
-               <xsdxt:code href="../api_samples/os-security-groups/security-group-add-post-req.json" />
+               <xsdxt:code href="../api_samples/os-security-groups/security-group-post-req.json" />
             </wadl:doc>
-            <param name="addSecurityGroup" style="plain" type="xsd:string" required="true">
+            <param name="security_group" style="plain" type="xsd:string" required="true">
                <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Add security group">
                   <para>
-                     Specify the <code>addSecurityGroup</code> action in the
+                     Specify the <code>security_group</code> action in the
                      request body.
                   </para>
                </wadl:doc>
diff --git a/api-ref/src/wadls/compute-api/src/v2/wadl/os-compute-2.wadl b/api-ref/src/wadls/compute-api/src/v2/wadl/os-compute-2.wadl
index 2bd000ff3..78e4196f9 100644
--- a/api-ref/src/wadls/compute-api/src/v2/wadl/os-compute-2.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/wadl/os-compute-2.wadl
@@ -1152,7 +1152,7 @@
          group with server">
          <para role="shortdesc">
             Associates a specified security group with a server.
-            Specify the <code>addSecurityGroup</code> action and
+            Specify the <code>security_group</code> action and
             the name of the security group in the request body.
          </para>
       </wadl:doc>