diff --git a/aws-cpp-sdk-apigateway/include/aws/apigateway/model/TestInvokeAuthorizerRequest.h b/aws-cpp-sdk-apigateway/include/aws/apigateway/model/TestInvokeAuthorizerRequest.h
index e148d7723da..0a51c87ed91 100644
--- a/aws-cpp-sdk-apigateway/include/aws/apigateway/model/TestInvokeAuthorizerRequest.h
+++ b/aws-cpp-sdk-apigateway/include/aws/apigateway/model/TestInvokeAuthorizerRequest.h
@@ -77,170 +77,170 @@ namespace Model
     inline TestInvokeAuthorizerRequest& WithAuthorizerId(const char* value) { SetAuthorizerId(value); return *this;}
 
     
-    inline const Aws::Map<Aws::String, Aws::String>& GetHeaders() const{ return m_headers; }
+    inline const Aws::String& GetPathWithQueryString() const{ return m_pathWithQueryString; }
 
     
-    inline void SetHeaders(const Aws::Map<Aws::String, Aws::String>& value) { m_headersHasBeenSet = true; m_headers = value; }
+    inline void SetPathWithQueryString(const Aws::String& value) { m_pathWithQueryStringHasBeenSet = true; m_pathWithQueryString = value; }
 
     
-    inline void SetHeaders(Aws::Map<Aws::String, Aws::String>&& value) { m_headersHasBeenSet = true; m_headers = value; }
+    inline void SetPathWithQueryString(Aws::String&& value) { m_pathWithQueryStringHasBeenSet = true; m_pathWithQueryString = value; }
 
     
-    inline TestInvokeAuthorizerRequest& WithHeaders(const Aws::Map<Aws::String, Aws::String>& value) { SetHeaders(value); return *this;}
+    inline void SetPathWithQueryString(const char* value) { m_pathWithQueryStringHasBeenSet = true; m_pathWithQueryString.assign(value); }
 
     
-    inline TestInvokeAuthorizerRequest& WithHeaders(Aws::Map<Aws::String, Aws::String>&& value) { SetHeaders(value); return *this;}
+    inline TestInvokeAuthorizerRequest& WithPathWithQueryString(const Aws::String& value) { SetPathWithQueryString(value); return *this;}
 
     
-    inline TestInvokeAuthorizerRequest& AddHeaders(const Aws::String& key, const Aws::String& value) { m_headersHasBeenSet = true; m_headers[key] = value; return *this; }
+    inline TestInvokeAuthorizerRequest& WithPathWithQueryString(Aws::String&& value) { SetPathWithQueryString(value); return *this;}
 
     
-    inline TestInvokeAuthorizerRequest& AddHeaders(Aws::String&& key, const Aws::String& value) { m_headersHasBeenSet = true; m_headers[key] = value; return *this; }
+    inline TestInvokeAuthorizerRequest& WithPathWithQueryString(const char* value) { SetPathWithQueryString(value); return *this;}
 
     
-    inline TestInvokeAuthorizerRequest& AddHeaders(const Aws::String& key, Aws::String&& value) { m_headersHasBeenSet = true; m_headers[key] = value; return *this; }
+    inline const Aws::Map<Aws::String, Aws::String>& GetStageVariables() const{ return m_stageVariables; }
 
     
-    inline TestInvokeAuthorizerRequest& AddHeaders(Aws::String&& key, Aws::String&& value) { m_headersHasBeenSet = true; m_headers[key] = value; return *this; }
+    inline void SetStageVariables(const Aws::Map<Aws::String, Aws::String>& value) { m_stageVariablesHasBeenSet = true; m_stageVariables = value; }
 
     
-    inline TestInvokeAuthorizerRequest& AddHeaders(const char* key, Aws::String&& value) { m_headersHasBeenSet = true; m_headers[key] = value; return *this; }
+    inline void SetStageVariables(Aws::Map<Aws::String, Aws::String>&& value) { m_stageVariablesHasBeenSet = true; m_stageVariables = value; }
 
     
-    inline TestInvokeAuthorizerRequest& AddHeaders(Aws::String&& key, const char* value) { m_headersHasBeenSet = true; m_headers[key] = value; return *this; }
+    inline TestInvokeAuthorizerRequest& WithStageVariables(const Aws::Map<Aws::String, Aws::String>& value) { SetStageVariables(value); return *this;}
 
     
-    inline TestInvokeAuthorizerRequest& AddHeaders(const char* key, const char* value) { m_headersHasBeenSet = true; m_headers[key] = value; return *this; }
+    inline TestInvokeAuthorizerRequest& WithStageVariables(Aws::Map<Aws::String, Aws::String>&& value) { SetStageVariables(value); return *this;}
 
     
-    inline const Aws::String& GetPathWithQueryString() const{ return m_pathWithQueryString; }
+    inline TestInvokeAuthorizerRequest& AddStageVariables(const Aws::String& key, const Aws::String& value) { m_stageVariablesHasBeenSet = true; m_stageVariables[key] = value; return *this; }
 
     
-    inline void SetPathWithQueryString(const Aws::String& value) { m_pathWithQueryStringHasBeenSet = true; m_pathWithQueryString = value; }
+    inline TestInvokeAuthorizerRequest& AddStageVariables(Aws::String&& key, const Aws::String& value) { m_stageVariablesHasBeenSet = true; m_stageVariables[key] = value; return *this; }
 
     
-    inline void SetPathWithQueryString(Aws::String&& value) { m_pathWithQueryStringHasBeenSet = true; m_pathWithQueryString = value; }
+    inline TestInvokeAuthorizerRequest& AddStageVariables(const Aws::String& key, Aws::String&& value) { m_stageVariablesHasBeenSet = true; m_stageVariables[key] = value; return *this; }
 
     
-    inline void SetPathWithQueryString(const char* value) { m_pathWithQueryStringHasBeenSet = true; m_pathWithQueryString.assign(value); }
+    inline TestInvokeAuthorizerRequest& AddStageVariables(Aws::String&& key, Aws::String&& value) { m_stageVariablesHasBeenSet = true; m_stageVariables[key] = value; return *this; }
 
     
-    inline TestInvokeAuthorizerRequest& WithPathWithQueryString(const Aws::String& value) { SetPathWithQueryString(value); return *this;}
+    inline TestInvokeAuthorizerRequest& AddStageVariables(const char* key, Aws::String&& value) { m_stageVariablesHasBeenSet = true; m_stageVariables[key] = value; return *this; }
 
     
-    inline TestInvokeAuthorizerRequest& WithPathWithQueryString(Aws::String&& value) { SetPathWithQueryString(value); return *this;}
+    inline TestInvokeAuthorizerRequest& AddStageVariables(Aws::String&& key, const char* value) { m_stageVariablesHasBeenSet = true; m_stageVariables[key] = value; return *this; }
 
     
-    inline TestInvokeAuthorizerRequest& WithPathWithQueryString(const char* value) { SetPathWithQueryString(value); return *this;}
+    inline TestInvokeAuthorizerRequest& AddStageVariables(const char* key, const char* value) { m_stageVariablesHasBeenSet = true; m_stageVariables[key] = value; return *this; }
 
     
-    inline const Aws::String& GetBody() const{ return m_body; }
+    inline const Aws::Map<Aws::String, Aws::String>& GetAdditionalContext() const{ return m_additionalContext; }
 
     
-    inline void SetBody(const Aws::String& value) { m_bodyHasBeenSet = true; m_body = value; }
+    inline void SetAdditionalContext(const Aws::Map<Aws::String, Aws::String>& value) { m_additionalContextHasBeenSet = true; m_additionalContext = value; }
 
     
-    inline void SetBody(Aws::String&& value) { m_bodyHasBeenSet = true; m_body = value; }
+    inline void SetAdditionalContext(Aws::Map<Aws::String, Aws::String>&& value) { m_additionalContextHasBeenSet = true; m_additionalContext = value; }
 
     
-    inline void SetBody(const char* value) { m_bodyHasBeenSet = true; m_body.assign(value); }
+    inline TestInvokeAuthorizerRequest& WithAdditionalContext(const Aws::Map<Aws::String, Aws::String>& value) { SetAdditionalContext(value); return *this;}
 
     
-    inline TestInvokeAuthorizerRequest& WithBody(const Aws::String& value) { SetBody(value); return *this;}
+    inline TestInvokeAuthorizerRequest& WithAdditionalContext(Aws::Map<Aws::String, Aws::String>&& value) { SetAdditionalContext(value); return *this;}
 
     
-    inline TestInvokeAuthorizerRequest& WithBody(Aws::String&& value) { SetBody(value); return *this;}
+    inline TestInvokeAuthorizerRequest& AddAdditionalContext(const Aws::String& key, const Aws::String& value) { m_additionalContextHasBeenSet = true; m_additionalContext[key] = value; return *this; }
 
     
-    inline TestInvokeAuthorizerRequest& WithBody(const char* value) { SetBody(value); return *this;}
+    inline TestInvokeAuthorizerRequest& AddAdditionalContext(Aws::String&& key, const Aws::String& value) { m_additionalContextHasBeenSet = true; m_additionalContext[key] = value; return *this; }
 
     
-    inline const Aws::Map<Aws::String, Aws::String>& GetStageVariables() const{ return m_stageVariables; }
+    inline TestInvokeAuthorizerRequest& AddAdditionalContext(const Aws::String& key, Aws::String&& value) { m_additionalContextHasBeenSet = true; m_additionalContext[key] = value; return *this; }
 
     
-    inline void SetStageVariables(const Aws::Map<Aws::String, Aws::String>& value) { m_stageVariablesHasBeenSet = true; m_stageVariables = value; }
+    inline TestInvokeAuthorizerRequest& AddAdditionalContext(Aws::String&& key, Aws::String&& value) { m_additionalContextHasBeenSet = true; m_additionalContext[key] = value; return *this; }
 
     
-    inline void SetStageVariables(Aws::Map<Aws::String, Aws::String>&& value) { m_stageVariablesHasBeenSet = true; m_stageVariables = value; }
+    inline TestInvokeAuthorizerRequest& AddAdditionalContext(const char* key, Aws::String&& value) { m_additionalContextHasBeenSet = true; m_additionalContext[key] = value; return *this; }
 
     
-    inline TestInvokeAuthorizerRequest& WithStageVariables(const Aws::Map<Aws::String, Aws::String>& value) { SetStageVariables(value); return *this;}
+    inline TestInvokeAuthorizerRequest& AddAdditionalContext(Aws::String&& key, const char* value) { m_additionalContextHasBeenSet = true; m_additionalContext[key] = value; return *this; }
 
     
-    inline TestInvokeAuthorizerRequest& WithStageVariables(Aws::Map<Aws::String, Aws::String>&& value) { SetStageVariables(value); return *this;}
+    inline TestInvokeAuthorizerRequest& AddAdditionalContext(const char* key, const char* value) { m_additionalContextHasBeenSet = true; m_additionalContext[key] = value; return *this; }
 
     
-    inline TestInvokeAuthorizerRequest& AddStageVariables(const Aws::String& key, const Aws::String& value) { m_stageVariablesHasBeenSet = true; m_stageVariables[key] = value; return *this; }
+    inline const Aws::String& GetRequestBody() const{ return m_requestBody; }
 
     
-    inline TestInvokeAuthorizerRequest& AddStageVariables(Aws::String&& key, const Aws::String& value) { m_stageVariablesHasBeenSet = true; m_stageVariables[key] = value; return *this; }
+    inline void SetRequestBody(const Aws::String& value) { m_requestBodyHasBeenSet = true; m_requestBody = value; }
 
     
-    inline TestInvokeAuthorizerRequest& AddStageVariables(const Aws::String& key, Aws::String&& value) { m_stageVariablesHasBeenSet = true; m_stageVariables[key] = value; return *this; }
+    inline void SetRequestBody(Aws::String&& value) { m_requestBodyHasBeenSet = true; m_requestBody = value; }
 
     
-    inline TestInvokeAuthorizerRequest& AddStageVariables(Aws::String&& key, Aws::String&& value) { m_stageVariablesHasBeenSet = true; m_stageVariables[key] = value; return *this; }
+    inline void SetRequestBody(const char* value) { m_requestBodyHasBeenSet = true; m_requestBody.assign(value); }
 
     
-    inline TestInvokeAuthorizerRequest& AddStageVariables(const char* key, Aws::String&& value) { m_stageVariablesHasBeenSet = true; m_stageVariables[key] = value; return *this; }
+    inline TestInvokeAuthorizerRequest& WithRequestBody(const Aws::String& value) { SetRequestBody(value); return *this;}
 
     
-    inline TestInvokeAuthorizerRequest& AddStageVariables(Aws::String&& key, const char* value) { m_stageVariablesHasBeenSet = true; m_stageVariables[key] = value; return *this; }
+    inline TestInvokeAuthorizerRequest& WithRequestBody(Aws::String&& value) { SetRequestBody(value); return *this;}
 
     
-    inline TestInvokeAuthorizerRequest& AddStageVariables(const char* key, const char* value) { m_stageVariablesHasBeenSet = true; m_stageVariables[key] = value; return *this; }
+    inline TestInvokeAuthorizerRequest& WithRequestBody(const char* value) { SetRequestBody(value); return *this;}
 
     
-    inline const Aws::Map<Aws::String, Aws::String>& GetAdditionalContext() const{ return m_additionalContext; }
+    inline const Aws::Map<Aws::String, Aws::String>& GetRequestHeaders() const{ return m_requestHeaders; }
 
     
-    inline void SetAdditionalContext(const Aws::Map<Aws::String, Aws::String>& value) { m_additionalContextHasBeenSet = true; m_additionalContext = value; }
+    inline void SetRequestHeaders(const Aws::Map<Aws::String, Aws::String>& value) { m_requestHeadersHasBeenSet = true; m_requestHeaders = value; }
 
     
-    inline void SetAdditionalContext(Aws::Map<Aws::String, Aws::String>&& value) { m_additionalContextHasBeenSet = true; m_additionalContext = value; }
+    inline void SetRequestHeaders(Aws::Map<Aws::String, Aws::String>&& value) { m_requestHeadersHasBeenSet = true; m_requestHeaders = value; }
 
     
-    inline TestInvokeAuthorizerRequest& WithAdditionalContext(const Aws::Map<Aws::String, Aws::String>& value) { SetAdditionalContext(value); return *this;}
+    inline TestInvokeAuthorizerRequest& WithRequestHeaders(const Aws::Map<Aws::String, Aws::String>& value) { SetRequestHeaders(value); return *this;}
 
     
-    inline TestInvokeAuthorizerRequest& WithAdditionalContext(Aws::Map<Aws::String, Aws::String>&& value) { SetAdditionalContext(value); return *this;}
+    inline TestInvokeAuthorizerRequest& WithRequestHeaders(Aws::Map<Aws::String, Aws::String>&& value) { SetRequestHeaders(value); return *this;}
 
     
-    inline TestInvokeAuthorizerRequest& AddAdditionalContext(const Aws::String& key, const Aws::String& value) { m_additionalContextHasBeenSet = true; m_additionalContext[key] = value; return *this; }
+    inline TestInvokeAuthorizerRequest& AddRequestHeaders(const Aws::String& key, const Aws::String& value) { m_requestHeadersHasBeenSet = true; m_requestHeaders[key] = value; return *this; }
 
     
-    inline TestInvokeAuthorizerRequest& AddAdditionalContext(Aws::String&& key, const Aws::String& value) { m_additionalContextHasBeenSet = true; m_additionalContext[key] = value; return *this; }
+    inline TestInvokeAuthorizerRequest& AddRequestHeaders(Aws::String&& key, const Aws::String& value) { m_requestHeadersHasBeenSet = true; m_requestHeaders[key] = value; return *this; }
 
     
-    inline TestInvokeAuthorizerRequest& AddAdditionalContext(const Aws::String& key, Aws::String&& value) { m_additionalContextHasBeenSet = true; m_additionalContext[key] = value; return *this; }
+    inline TestInvokeAuthorizerRequest& AddRequestHeaders(const Aws::String& key, Aws::String&& value) { m_requestHeadersHasBeenSet = true; m_requestHeaders[key] = value; return *this; }
 
     
-    inline TestInvokeAuthorizerRequest& AddAdditionalContext(Aws::String&& key, Aws::String&& value) { m_additionalContextHasBeenSet = true; m_additionalContext[key] = value; return *this; }
+    inline TestInvokeAuthorizerRequest& AddRequestHeaders(Aws::String&& key, Aws::String&& value) { m_requestHeadersHasBeenSet = true; m_requestHeaders[key] = value; return *this; }
 
     
-    inline TestInvokeAuthorizerRequest& AddAdditionalContext(const char* key, Aws::String&& value) { m_additionalContextHasBeenSet = true; m_additionalContext[key] = value; return *this; }
+    inline TestInvokeAuthorizerRequest& AddRequestHeaders(const char* key, Aws::String&& value) { m_requestHeadersHasBeenSet = true; m_requestHeaders[key] = value; return *this; }
 
     
-    inline TestInvokeAuthorizerRequest& AddAdditionalContext(Aws::String&& key, const char* value) { m_additionalContextHasBeenSet = true; m_additionalContext[key] = value; return *this; }
+    inline TestInvokeAuthorizerRequest& AddRequestHeaders(Aws::String&& key, const char* value) { m_requestHeadersHasBeenSet = true; m_requestHeaders[key] = value; return *this; }
 
     
-    inline TestInvokeAuthorizerRequest& AddAdditionalContext(const char* key, const char* value) { m_additionalContextHasBeenSet = true; m_additionalContext[key] = value; return *this; }
+    inline TestInvokeAuthorizerRequest& AddRequestHeaders(const char* key, const char* value) { m_requestHeadersHasBeenSet = true; m_requestHeaders[key] = value; return *this; }
 
   private:
     Aws::String m_restApiId;
     bool m_restApiIdHasBeenSet;
     Aws::String m_authorizerId;
     bool m_authorizerIdHasBeenSet;
-    Aws::Map<Aws::String, Aws::String> m_headers;
-    bool m_headersHasBeenSet;
     Aws::String m_pathWithQueryString;
     bool m_pathWithQueryStringHasBeenSet;
-    Aws::String m_body;
-    bool m_bodyHasBeenSet;
     Aws::Map<Aws::String, Aws::String> m_stageVariables;
     bool m_stageVariablesHasBeenSet;
     Aws::Map<Aws::String, Aws::String> m_additionalContext;
     bool m_additionalContextHasBeenSet;
+    Aws::String m_requestBody;
+    bool m_requestBodyHasBeenSet;
+    Aws::Map<Aws::String, Aws::String> m_requestHeaders;
+    bool m_requestHeadersHasBeenSet;
   };
 
 } // namespace Model
diff --git a/aws-cpp-sdk-apigateway/source/model/TestInvokeAuthorizerRequest.cpp b/aws-cpp-sdk-apigateway/source/model/TestInvokeAuthorizerRequest.cpp
index e56c5c3cbbf..bd039a736a2 100644
--- a/aws-cpp-sdk-apigateway/source/model/TestInvokeAuthorizerRequest.cpp
+++ b/aws-cpp-sdk-apigateway/source/model/TestInvokeAuthorizerRequest.cpp
@@ -24,11 +24,11 @@ using namespace Aws::Utils;
 TestInvokeAuthorizerRequest::TestInvokeAuthorizerRequest() : 
     m_restApiIdHasBeenSet(false),
     m_authorizerIdHasBeenSet(false),
-    m_headersHasBeenSet(false),
     m_pathWithQueryStringHasBeenSet(false),
-    m_bodyHasBeenSet(false),
     m_stageVariablesHasBeenSet(false),
-    m_additionalContextHasBeenSet(false)
+    m_additionalContextHasBeenSet(false),
+    m_requestBodyHasBeenSet(false),
+    m_requestHeadersHasBeenSet(false)
 {
 }
 
@@ -36,29 +36,12 @@ Aws::String TestInvokeAuthorizerRequest::SerializePayload() const
 {
   JsonValue payload;
 
-  if(m_headersHasBeenSet)
-  {
-   JsonValue headersJsonMap;
-   for(auto& headersItem : m_headers)
-   {
-     headersJsonMap.WithString(headersItem.first, headersItem.second);
-   }
-   payload.WithObject("headers", std::move(headersJsonMap));
-
-  }
-
   if(m_pathWithQueryStringHasBeenSet)
   {
    payload.WithString("pathWithQueryString", m_pathWithQueryString);
 
   }
 
-  if(m_bodyHasBeenSet)
-  {
-   payload.WithString("body", m_body);
-
-  }
-
   if(m_stageVariablesHasBeenSet)
   {
    JsonValue stageVariablesJsonMap;
@@ -81,6 +64,23 @@ Aws::String TestInvokeAuthorizerRequest::SerializePayload() const
 
   }
 
+  if(m_requestBodyHasBeenSet)
+  {
+   payload.WithString("requestBody", m_requestBody);
+
+  }
+
+  if(m_requestHeadersHasBeenSet)
+  {
+   JsonValue requestHeadersJsonMap;
+   for(auto& requestHeadersItem : m_requestHeaders)
+   {
+     requestHeadersJsonMap.WithString(requestHeadersItem.first, requestHeadersItem.second);
+   }
+   payload.WithObject("requestHeaders", std::move(requestHeadersJsonMap));
+
+  }
+
   return payload.WriteReadable();
 }
 
diff --git a/aws-cpp-sdk-core/include/aws/core/VersionConfig.h b/aws-cpp-sdk-core/include/aws/core/VersionConfig.h
index 1acfc7550cf..3d4a4f39fa9 100644
--- a/aws-cpp-sdk-core/include/aws/core/VersionConfig.h
+++ b/aws-cpp-sdk-core/include/aws/core/VersionConfig.h
@@ -13,4 +13,4 @@
   * permissions and limitations under the License.
   */
 
-#define AWS_SDK_VERSION_STRING "0.9.6-59-gc476146"
+#define AWS_SDK_VERSION_STRING "0.9.6-60-g480f9c7"
diff --git a/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/apigateway/APIGatewayRestJsonCppClientGenerator.java b/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/apigateway/APIGatewayRestJsonCppClientGenerator.java
index c634d4bbf60..41280aecf59 100644
--- a/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/apigateway/APIGatewayRestJsonCppClientGenerator.java
+++ b/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/apigateway/APIGatewayRestJsonCppClientGenerator.java
@@ -46,6 +46,19 @@ public SdkFileEntry[] generateSourceFiles(ServiceModel serviceModel) throws Exce
         members.put("requestHeaders", headersMember);
         members.remove("headers");
 
+        Shape authorizerRequest = serviceModel.getShapes().get("TestInvokeAuthorizerRequest");
+        members = authorizerRequest.getMembers();
+
+        //rename body
+        bodyMember = members.get("body");
+        members.put("requestBody", bodyMember);
+        members.remove("body");
+
+        //rename headers
+        headersMember = members.get("headers");
+        members.put("requestHeaders", headersMember);
+        members.remove("headers");
+
         return super.generateSourceFiles(serviceModel);
     }
 }