diff --git a/sdk/amplifyuibuilder/src/protocol_serde.rs b/sdk/amplifyuibuilder/src/protocol_serde.rs
index bf1f9bf1c3f4..a0a06f0de38b 100644
--- a/sdk/amplifyuibuilder/src/protocol_serde.rs
+++ b/sdk/amplifyuibuilder/src/protocol_serde.rs
@@ -25,7 +25,7 @@ pub fn parse_http_error_metadata(
 
 pub(crate) mod shape_create_component;
 
-pub fn rest_json_unsetpayload() -> ::std::vec::Vec<u8> {
+pub fn rest_json_unset_struct_payload() -> ::std::vec::Vec<u8> {
     b"{}"[..].into()
 }
 
diff --git a/sdk/amplifyuibuilder/src/protocol_serde/shape_create_component_input.rs b/sdk/amplifyuibuilder/src/protocol_serde/shape_create_component_input.rs
index 3a57ad8f2b31..65114c423df7 100644
--- a/sdk/amplifyuibuilder/src/protocol_serde/shape_create_component_input.rs
+++ b/sdk/amplifyuibuilder/src/protocol_serde/shape_create_component_input.rs
@@ -4,7 +4,7 @@ pub fn ser_component_to_create_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_component_input::ser_component_to_create_payload(
         payload,
diff --git a/sdk/amplifyuibuilder/src/protocol_serde/shape_create_form_input.rs b/sdk/amplifyuibuilder/src/protocol_serde/shape_create_form_input.rs
index c0260d2e3a26..387000e6ef57 100644
--- a/sdk/amplifyuibuilder/src/protocol_serde/shape_create_form_input.rs
+++ b/sdk/amplifyuibuilder/src/protocol_serde/shape_create_form_input.rs
@@ -4,7 +4,7 @@ pub fn ser_form_to_create_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_form_input::ser_form_to_create_payload(payload)?)
 }
diff --git a/sdk/amplifyuibuilder/src/protocol_serde/shape_create_theme_input.rs b/sdk/amplifyuibuilder/src/protocol_serde/shape_create_theme_input.rs
index 217d1aba511b..5f2d49ffd4b1 100644
--- a/sdk/amplifyuibuilder/src/protocol_serde/shape_create_theme_input.rs
+++ b/sdk/amplifyuibuilder/src/protocol_serde/shape_create_theme_input.rs
@@ -4,7 +4,7 @@ pub fn ser_theme_to_create_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_theme_input::ser_theme_to_create_payload(payload)?)
 }
diff --git a/sdk/amplifyuibuilder/src/protocol_serde/shape_exchange_code_for_token_input.rs b/sdk/amplifyuibuilder/src/protocol_serde/shape_exchange_code_for_token_input.rs
index d0bdbb22226e..a982ff924663 100644
--- a/sdk/amplifyuibuilder/src/protocol_serde/shape_exchange_code_for_token_input.rs
+++ b/sdk/amplifyuibuilder/src/protocol_serde/shape_exchange_code_for_token_input.rs
@@ -4,7 +4,7 @@ pub fn ser_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_exchange_code_for_token_input::ser_request_payload(payload)?)
 }
diff --git a/sdk/amplifyuibuilder/src/protocol_serde/shape_put_metadata_flag_input.rs b/sdk/amplifyuibuilder/src/protocol_serde/shape_put_metadata_flag_input.rs
index 6cfa38ca9dd0..0f918252b939 100644
--- a/sdk/amplifyuibuilder/src/protocol_serde/shape_put_metadata_flag_input.rs
+++ b/sdk/amplifyuibuilder/src/protocol_serde/shape_put_metadata_flag_input.rs
@@ -4,7 +4,7 @@ pub fn ser_body_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_metadata_flag_input::ser_body_payload(payload)?)
 }
diff --git a/sdk/amplifyuibuilder/src/protocol_serde/shape_refresh_token_input.rs b/sdk/amplifyuibuilder/src/protocol_serde/shape_refresh_token_input.rs
index c7ed48ce189b..6355dd743e48 100644
--- a/sdk/amplifyuibuilder/src/protocol_serde/shape_refresh_token_input.rs
+++ b/sdk/amplifyuibuilder/src/protocol_serde/shape_refresh_token_input.rs
@@ -4,7 +4,7 @@ pub fn ser_refresh_token_body_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_refresh_token_input::ser_refresh_token_body_payload(payload)?)
 }
diff --git a/sdk/amplifyuibuilder/src/protocol_serde/shape_start_codegen_job_input.rs b/sdk/amplifyuibuilder/src/protocol_serde/shape_start_codegen_job_input.rs
index 674d28ac8ad3..700ac49642b1 100644
--- a/sdk/amplifyuibuilder/src/protocol_serde/shape_start_codegen_job_input.rs
+++ b/sdk/amplifyuibuilder/src/protocol_serde/shape_start_codegen_job_input.rs
@@ -4,7 +4,7 @@ pub fn ser_codegen_job_to_create_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_start_codegen_job_input::ser_codegen_job_to_create_payload(
         payload,
diff --git a/sdk/amplifyuibuilder/src/protocol_serde/shape_update_component_input.rs b/sdk/amplifyuibuilder/src/protocol_serde/shape_update_component_input.rs
index e235adf75766..d2bcf18d18cf 100644
--- a/sdk/amplifyuibuilder/src/protocol_serde/shape_update_component_input.rs
+++ b/sdk/amplifyuibuilder/src/protocol_serde/shape_update_component_input.rs
@@ -4,7 +4,7 @@ pub fn ser_updated_component_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_component_input::ser_updated_component_payload(
         payload,
diff --git a/sdk/amplifyuibuilder/src/protocol_serde/shape_update_form_input.rs b/sdk/amplifyuibuilder/src/protocol_serde/shape_update_form_input.rs
index 2c60e12023a5..ef8871473ea3 100644
--- a/sdk/amplifyuibuilder/src/protocol_serde/shape_update_form_input.rs
+++ b/sdk/amplifyuibuilder/src/protocol_serde/shape_update_form_input.rs
@@ -4,7 +4,7 @@ pub fn ser_updated_form_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_form_input::ser_updated_form_payload(payload)?)
 }
diff --git a/sdk/amplifyuibuilder/src/protocol_serde/shape_update_theme_input.rs b/sdk/amplifyuibuilder/src/protocol_serde/shape_update_theme_input.rs
index c23e742d667f..1dc5cf05c356 100644
--- a/sdk/amplifyuibuilder/src/protocol_serde/shape_update_theme_input.rs
+++ b/sdk/amplifyuibuilder/src/protocol_serde/shape_update_theme_input.rs
@@ -4,7 +4,7 @@ pub fn ser_updated_theme_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_theme_input::ser_updated_theme_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde.rs b/sdk/cloudfront/src/protocol_serde.rs
index b7e0c8503d39..b404c9493f6e 100644
--- a/sdk/cloudfront/src/protocol_serde.rs
+++ b/sdk/cloudfront/src/protocol_serde.rs
@@ -29,7 +29,7 @@ pub(crate) mod shape_copy_distribution;
 
 pub(crate) mod shape_create_cache_policy;
 
-pub fn rest_xml_unset_payload() -> ::std::vec::Vec<u8> {
+pub fn rest_xml_unset_struct_payload() -> ::std::vec::Vec<u8> {
     Vec::new()
 }
 
diff --git a/sdk/cloudfront/src/protocol_serde/shape_create_cache_policy_input.rs b/sdk/cloudfront/src/protocol_serde/shape_create_cache_policy_input.rs
index d48934032170..1bdb849ad438 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_create_cache_policy_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_create_cache_policy_input.rs
@@ -4,7 +4,7 @@ pub fn ser_cache_policy_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_cache_policy_input::ser_cache_policy_config_payload(
         payload,
diff --git a/sdk/cloudfront/src/protocol_serde/shape_create_cloud_front_origin_access_identity_input.rs b/sdk/cloudfront/src/protocol_serde/shape_create_cloud_front_origin_access_identity_input.rs
index 351141ba23ff..b7166135e939 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_create_cloud_front_origin_access_identity_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_create_cloud_front_origin_access_identity_input.rs
@@ -4,7 +4,7 @@ pub fn ser_cloud_front_origin_access_identity_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_cloud_front_origin_access_identity_input::ser_cloud_front_origin_access_identity_config_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde/shape_create_continuous_deployment_policy_input.rs b/sdk/cloudfront/src/protocol_serde/shape_create_continuous_deployment_policy_input.rs
index e977711fafb8..b7fd1d92f4f5 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_create_continuous_deployment_policy_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_create_continuous_deployment_policy_input.rs
@@ -4,7 +4,7 @@ pub fn ser_continuous_deployment_policy_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_continuous_deployment_policy_input::ser_continuous_deployment_policy_config_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde/shape_create_distribution_input.rs b/sdk/cloudfront/src/protocol_serde/shape_create_distribution_input.rs
index c35884758f22..c543c4fa78d4 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_create_distribution_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_create_distribution_input.rs
@@ -4,7 +4,7 @@ pub fn ser_distribution_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_distribution_input::ser_distribution_config_payload(
         payload,
diff --git a/sdk/cloudfront/src/protocol_serde/shape_create_distribution_with_tags_input.rs b/sdk/cloudfront/src/protocol_serde/shape_create_distribution_with_tags_input.rs
index e15a07fca55a..e138e5d2ddc7 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_create_distribution_with_tags_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_create_distribution_with_tags_input.rs
@@ -4,7 +4,7 @@ pub fn ser_distribution_config_with_tags_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_distribution_with_tags_input::ser_distribution_config_with_tags_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde/shape_create_field_level_encryption_config_input.rs b/sdk/cloudfront/src/protocol_serde/shape_create_field_level_encryption_config_input.rs
index 7ff0de9bb41a..d763cfd6b17c 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_create_field_level_encryption_config_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_create_field_level_encryption_config_input.rs
@@ -4,7 +4,7 @@ pub fn ser_field_level_encryption_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_field_level_encryption_config_input::ser_field_level_encryption_config_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde/shape_create_field_level_encryption_profile_input.rs b/sdk/cloudfront/src/protocol_serde/shape_create_field_level_encryption_profile_input.rs
index 66ee30e54128..b509872ebad1 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_create_field_level_encryption_profile_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_create_field_level_encryption_profile_input.rs
@@ -4,7 +4,7 @@ pub fn ser_field_level_encryption_profile_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_field_level_encryption_profile_input::ser_field_level_encryption_profile_config_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde/shape_create_invalidation_input.rs b/sdk/cloudfront/src/protocol_serde/shape_create_invalidation_input.rs
index 246d06548db2..8fa8f4f9f3b6 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_create_invalidation_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_create_invalidation_input.rs
@@ -4,7 +4,7 @@ pub fn ser_invalidation_batch_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_invalidation_input::ser_invalidation_batch_payload(
         payload,
diff --git a/sdk/cloudfront/src/protocol_serde/shape_create_key_group_input.rs b/sdk/cloudfront/src/protocol_serde/shape_create_key_group_input.rs
index 00637853ea5c..0da234d14f72 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_create_key_group_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_create_key_group_input.rs
@@ -4,7 +4,7 @@ pub fn ser_key_group_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_key_group_input::ser_key_group_config_payload(
         payload,
diff --git a/sdk/cloudfront/src/protocol_serde/shape_create_monitoring_subscription_input.rs b/sdk/cloudfront/src/protocol_serde/shape_create_monitoring_subscription_input.rs
index 846e1a019eea..4872dd409c9a 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_create_monitoring_subscription_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_create_monitoring_subscription_input.rs
@@ -4,7 +4,7 @@ pub fn ser_monitoring_subscription_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_monitoring_subscription_input::ser_monitoring_subscription_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde/shape_create_origin_access_control_input.rs b/sdk/cloudfront/src/protocol_serde/shape_create_origin_access_control_input.rs
index 4c836eef3a4a..9b48b50a24b3 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_create_origin_access_control_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_create_origin_access_control_input.rs
@@ -4,7 +4,7 @@ pub fn ser_origin_access_control_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_origin_access_control_input::ser_origin_access_control_config_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde/shape_create_origin_request_policy_input.rs b/sdk/cloudfront/src/protocol_serde/shape_create_origin_request_policy_input.rs
index 8751cdd57222..a3df18376969 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_create_origin_request_policy_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_create_origin_request_policy_input.rs
@@ -4,7 +4,7 @@ pub fn ser_origin_request_policy_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_origin_request_policy_input::ser_origin_request_policy_config_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde/shape_create_public_key_input.rs b/sdk/cloudfront/src/protocol_serde/shape_create_public_key_input.rs
index 46e66b1d7742..5f6a0b7caada 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_create_public_key_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_create_public_key_input.rs
@@ -4,7 +4,7 @@ pub fn ser_public_key_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_public_key_input::ser_public_key_config_payload(
         payload,
diff --git a/sdk/cloudfront/src/protocol_serde/shape_create_response_headers_policy_input.rs b/sdk/cloudfront/src/protocol_serde/shape_create_response_headers_policy_input.rs
index 0ab51af9fd47..36142b5708f1 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_create_response_headers_policy_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_create_response_headers_policy_input.rs
@@ -4,7 +4,7 @@ pub fn ser_response_headers_policy_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_response_headers_policy_input::ser_response_headers_policy_config_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde/shape_create_streaming_distribution_input.rs b/sdk/cloudfront/src/protocol_serde/shape_create_streaming_distribution_input.rs
index 5ed2e6994857..3c08fc1fc5ce 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_create_streaming_distribution_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_create_streaming_distribution_input.rs
@@ -4,7 +4,7 @@ pub fn ser_streaming_distribution_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_streaming_distribution_input::ser_streaming_distribution_config_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde/shape_create_streaming_distribution_with_tags_input.rs b/sdk/cloudfront/src/protocol_serde/shape_create_streaming_distribution_with_tags_input.rs
index 9b00a398764c..be0f80b31269 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_create_streaming_distribution_with_tags_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_create_streaming_distribution_with_tags_input.rs
@@ -4,7 +4,7 @@ pub fn ser_streaming_distribution_config_with_tags_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_streaming_distribution_with_tags_input::ser_streaming_distribution_config_with_tags_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde/shape_tag_resource_input.rs b/sdk/cloudfront/src/protocol_serde/shape_tag_resource_input.rs
index ce2c54b0c016..12beae9f3ecd 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_tag_resource_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_tag_resource_input.rs
@@ -4,7 +4,7 @@ pub fn ser_tags_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_tag_resource_input::ser_tags_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde/shape_untag_resource_input.rs b/sdk/cloudfront/src/protocol_serde/shape_untag_resource_input.rs
index dacc40628e98..8f08d09e7869 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_untag_resource_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_untag_resource_input.rs
@@ -4,7 +4,7 @@ pub fn ser_tag_keys_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_untag_resource_input::ser_tag_keys_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde/shape_update_cache_policy_input.rs b/sdk/cloudfront/src/protocol_serde/shape_update_cache_policy_input.rs
index 3a12df161edc..dc6de16ae498 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_update_cache_policy_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_update_cache_policy_input.rs
@@ -4,7 +4,7 @@ pub fn ser_cache_policy_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_cache_policy_input::ser_cache_policy_config_payload(
         payload,
diff --git a/sdk/cloudfront/src/protocol_serde/shape_update_cloud_front_origin_access_identity_input.rs b/sdk/cloudfront/src/protocol_serde/shape_update_cloud_front_origin_access_identity_input.rs
index a16c6a36441d..1c4ab11219b4 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_update_cloud_front_origin_access_identity_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_update_cloud_front_origin_access_identity_input.rs
@@ -4,7 +4,7 @@ pub fn ser_cloud_front_origin_access_identity_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_cloud_front_origin_access_identity_input::ser_cloud_front_origin_access_identity_config_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde/shape_update_continuous_deployment_policy_input.rs b/sdk/cloudfront/src/protocol_serde/shape_update_continuous_deployment_policy_input.rs
index 5f64de953116..4b75d8b367f8 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_update_continuous_deployment_policy_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_update_continuous_deployment_policy_input.rs
@@ -4,7 +4,7 @@ pub fn ser_continuous_deployment_policy_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_continuous_deployment_policy_input::ser_continuous_deployment_policy_config_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde/shape_update_distribution_input.rs b/sdk/cloudfront/src/protocol_serde/shape_update_distribution_input.rs
index 54707d6c7291..f81915320530 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_update_distribution_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_update_distribution_input.rs
@@ -4,7 +4,7 @@ pub fn ser_distribution_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_distribution_input::ser_distribution_config_payload(
         payload,
diff --git a/sdk/cloudfront/src/protocol_serde/shape_update_field_level_encryption_config_input.rs b/sdk/cloudfront/src/protocol_serde/shape_update_field_level_encryption_config_input.rs
index 87a12a61fdd0..1e21c15f55a7 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_update_field_level_encryption_config_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_update_field_level_encryption_config_input.rs
@@ -4,7 +4,7 @@ pub fn ser_field_level_encryption_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_field_level_encryption_config_input::ser_field_level_encryption_config_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde/shape_update_field_level_encryption_profile_input.rs b/sdk/cloudfront/src/protocol_serde/shape_update_field_level_encryption_profile_input.rs
index d509daaea925..49eb5bf1919f 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_update_field_level_encryption_profile_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_update_field_level_encryption_profile_input.rs
@@ -4,7 +4,7 @@ pub fn ser_field_level_encryption_profile_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_field_level_encryption_profile_input::ser_field_level_encryption_profile_config_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde/shape_update_key_group_input.rs b/sdk/cloudfront/src/protocol_serde/shape_update_key_group_input.rs
index 49e154632aaa..dfda7e43e676 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_update_key_group_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_update_key_group_input.rs
@@ -4,7 +4,7 @@ pub fn ser_key_group_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_key_group_input::ser_key_group_config_payload(
         payload,
diff --git a/sdk/cloudfront/src/protocol_serde/shape_update_origin_access_control_input.rs b/sdk/cloudfront/src/protocol_serde/shape_update_origin_access_control_input.rs
index 20ef9b0a2cd6..f8c61d8ece99 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_update_origin_access_control_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_update_origin_access_control_input.rs
@@ -4,7 +4,7 @@ pub fn ser_origin_access_control_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_origin_access_control_input::ser_origin_access_control_config_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde/shape_update_origin_request_policy_input.rs b/sdk/cloudfront/src/protocol_serde/shape_update_origin_request_policy_input.rs
index f6494c35dc83..a1120d8dd4ec 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_update_origin_request_policy_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_update_origin_request_policy_input.rs
@@ -4,7 +4,7 @@ pub fn ser_origin_request_policy_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_origin_request_policy_input::ser_origin_request_policy_config_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde/shape_update_public_key_input.rs b/sdk/cloudfront/src/protocol_serde/shape_update_public_key_input.rs
index 7f409ec9bb54..c6f342aa5dee 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_update_public_key_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_update_public_key_input.rs
@@ -4,7 +4,7 @@ pub fn ser_public_key_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_public_key_input::ser_public_key_config_payload(
         payload,
diff --git a/sdk/cloudfront/src/protocol_serde/shape_update_response_headers_policy_input.rs b/sdk/cloudfront/src/protocol_serde/shape_update_response_headers_policy_input.rs
index e4e551940110..b156ee67c6a8 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_update_response_headers_policy_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_update_response_headers_policy_input.rs
@@ -4,7 +4,7 @@ pub fn ser_response_headers_policy_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_response_headers_policy_input::ser_response_headers_policy_config_payload(payload)?)
 }
diff --git a/sdk/cloudfront/src/protocol_serde/shape_update_streaming_distribution_input.rs b/sdk/cloudfront/src/protocol_serde/shape_update_streaming_distribution_input.rs
index add0b86b72dc..a7dbf96a3f51 100644
--- a/sdk/cloudfront/src/protocol_serde/shape_update_streaming_distribution_input.rs
+++ b/sdk/cloudfront/src/protocol_serde/shape_update_streaming_distribution_input.rs
@@ -4,7 +4,7 @@ pub fn ser_streaming_distribution_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_streaming_distribution_input::ser_streaming_distribution_config_payload(payload)?)
 }
diff --git a/sdk/glacier/src/protocol_serde.rs b/sdk/glacier/src/protocol_serde.rs
index c841b9864c8b..cd81898f3e23 100644
--- a/sdk/glacier/src/protocol_serde.rs
+++ b/sdk/glacier/src/protocol_serde.rs
@@ -59,7 +59,7 @@ pub(crate) mod shape_get_vault_notifications;
 
 pub(crate) mod shape_initiate_job;
 
-pub fn rest_json_unsetpayload() -> ::std::vec::Vec<u8> {
+pub fn rest_json_unset_struct_payload() -> ::std::vec::Vec<u8> {
     b"{}"[..].into()
 }
 
diff --git a/sdk/glacier/src/protocol_serde/shape_initiate_job_input.rs b/sdk/glacier/src/protocol_serde/shape_initiate_job_input.rs
index 4fdc78552a74..48091a4e0f00 100644
--- a/sdk/glacier/src/protocol_serde/shape_initiate_job_input.rs
+++ b/sdk/glacier/src/protocol_serde/shape_initiate_job_input.rs
@@ -4,7 +4,7 @@ pub fn ser_job_parameters_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_initiate_job_input::ser_job_parameters_payload(payload)?)
 }
diff --git a/sdk/glacier/src/protocol_serde/shape_initiate_vault_lock_input.rs b/sdk/glacier/src/protocol_serde/shape_initiate_vault_lock_input.rs
index 82febf09066f..9cc1dff9b01b 100644
--- a/sdk/glacier/src/protocol_serde/shape_initiate_vault_lock_input.rs
+++ b/sdk/glacier/src/protocol_serde/shape_initiate_vault_lock_input.rs
@@ -4,7 +4,7 @@ pub fn ser_policy_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_initiate_vault_lock_input::ser_policy_payload(payload)?)
 }
diff --git a/sdk/glacier/src/protocol_serde/shape_set_vault_access_policy_input.rs b/sdk/glacier/src/protocol_serde/shape_set_vault_access_policy_input.rs
index 8a00c7dfc9d1..a4e46d80ea79 100644
--- a/sdk/glacier/src/protocol_serde/shape_set_vault_access_policy_input.rs
+++ b/sdk/glacier/src/protocol_serde/shape_set_vault_access_policy_input.rs
@@ -4,7 +4,7 @@ pub fn ser_policy_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_set_vault_access_policy_input::ser_policy_payload(payload)?)
 }
diff --git a/sdk/glacier/src/protocol_serde/shape_set_vault_notifications_input.rs b/sdk/glacier/src/protocol_serde/shape_set_vault_notifications_input.rs
index 0771a2967067..766a6745e4a5 100644
--- a/sdk/glacier/src/protocol_serde/shape_set_vault_notifications_input.rs
+++ b/sdk/glacier/src/protocol_serde/shape_set_vault_notifications_input.rs
@@ -4,7 +4,7 @@ pub fn ser_vault_notification_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_set_vault_notifications_input::ser_vault_notification_config_payload(payload)?)
 }
diff --git a/sdk/iot/src/protocol_serde.rs b/sdk/iot/src/protocol_serde.rs
index 00d374aea894..be3ca6ebdf28 100644
--- a/sdk/iot/src/protocol_serde.rs
+++ b/sdk/iot/src/protocol_serde.rs
@@ -115,7 +115,7 @@ pub(crate) mod shape_create_topic_rule;
 
 pub(crate) mod shape_create_topic_rule_destination;
 
-pub fn rest_json_unsetpayload() -> ::std::vec::Vec<u8> {
+pub fn rest_json_unset_struct_payload() -> ::std::vec::Vec<u8> {
     b"{}"[..].into()
 }
 
diff --git a/sdk/iot/src/protocol_serde/shape_create_topic_rule_input.rs b/sdk/iot/src/protocol_serde/shape_create_topic_rule_input.rs
index 28c9841500b6..78a1c8a4179c 100644
--- a/sdk/iot/src/protocol_serde/shape_create_topic_rule_input.rs
+++ b/sdk/iot/src/protocol_serde/shape_create_topic_rule_input.rs
@@ -4,7 +4,7 @@ pub fn ser_topic_rule_payload_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_topic_rule_input::ser_topic_rule_payload_payload(
         payload,
diff --git a/sdk/iot/src/protocol_serde/shape_replace_topic_rule_input.rs b/sdk/iot/src/protocol_serde/shape_replace_topic_rule_input.rs
index e464cb9ff27c..595c3c2f6cf9 100644
--- a/sdk/iot/src/protocol_serde/shape_replace_topic_rule_input.rs
+++ b/sdk/iot/src/protocol_serde/shape_replace_topic_rule_input.rs
@@ -4,7 +4,7 @@ pub fn ser_topic_rule_payload_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_replace_topic_rule_input::ser_topic_rule_payload_payload(
         payload,
diff --git a/sdk/iot/src/protocol_serde/shape_set_logging_options_input.rs b/sdk/iot/src/protocol_serde/shape_set_logging_options_input.rs
index cb1bd1b7926e..554f081b1eb6 100644
--- a/sdk/iot/src/protocol_serde/shape_set_logging_options_input.rs
+++ b/sdk/iot/src/protocol_serde/shape_set_logging_options_input.rs
@@ -4,7 +4,7 @@ pub fn ser_logging_options_payload_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_set_logging_options_input::ser_logging_options_payload_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde.rs b/sdk/pinpoint/src/protocol_serde.rs
index 6833d824cda6..e264a4073f99 100644
--- a/sdk/pinpoint/src/protocol_serde.rs
+++ b/sdk/pinpoint/src/protocol_serde.rs
@@ -25,7 +25,7 @@ pub fn parse_http_error_metadata(
 
 pub(crate) mod shape_create_app;
 
-pub fn rest_json_unsetpayload() -> ::std::vec::Vec<u8> {
+pub fn rest_json_unset_struct_payload() -> ::std::vec::Vec<u8> {
     b"{}"[..].into()
 }
 
diff --git a/sdk/pinpoint/src/protocol_serde/shape_create_app_input.rs b/sdk/pinpoint/src/protocol_serde/shape_create_app_input.rs
index 4609a76376b8..b6a7200b31b4 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_create_app_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_create_app_input.rs
@@ -4,7 +4,7 @@ pub fn ser_create_application_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_app_input::ser_create_application_request_payload(
         payload,
diff --git a/sdk/pinpoint/src/protocol_serde/shape_create_campaign_input.rs b/sdk/pinpoint/src/protocol_serde/shape_create_campaign_input.rs
index eeaef671a08a..f81ce1b2d9ed 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_create_campaign_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_create_campaign_input.rs
@@ -4,7 +4,7 @@ pub fn ser_write_campaign_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_campaign_input::ser_write_campaign_request_payload(
         payload,
diff --git a/sdk/pinpoint/src/protocol_serde/shape_create_email_template_input.rs b/sdk/pinpoint/src/protocol_serde/shape_create_email_template_input.rs
index 0a6564caea73..92bfc146c14b 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_create_email_template_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_create_email_template_input.rs
@@ -4,7 +4,7 @@ pub fn ser_email_template_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_email_template_input::ser_email_template_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_create_export_job_input.rs b/sdk/pinpoint/src/protocol_serde/shape_create_export_job_input.rs
index 0388a1f3d909..12d44a5f5d2b 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_create_export_job_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_create_export_job_input.rs
@@ -4,7 +4,7 @@ pub fn ser_export_job_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_export_job_input::ser_export_job_request_payload(
         payload,
diff --git a/sdk/pinpoint/src/protocol_serde/shape_create_import_job_input.rs b/sdk/pinpoint/src/protocol_serde/shape_create_import_job_input.rs
index 2e16edaa01f3..3f77af966ba4 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_create_import_job_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_create_import_job_input.rs
@@ -4,7 +4,7 @@ pub fn ser_import_job_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_import_job_input::ser_import_job_request_payload(
         payload,
diff --git a/sdk/pinpoint/src/protocol_serde/shape_create_in_app_template_input.rs b/sdk/pinpoint/src/protocol_serde/shape_create_in_app_template_input.rs
index 182d763ee878..08177a25e579 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_create_in_app_template_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_create_in_app_template_input.rs
@@ -4,7 +4,7 @@ pub fn ser_in_app_template_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_in_app_template_input::ser_in_app_template_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_create_journey_input.rs b/sdk/pinpoint/src/protocol_serde/shape_create_journey_input.rs
index 18d2cfdc92f4..01d2664e75d4 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_create_journey_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_create_journey_input.rs
@@ -4,7 +4,7 @@ pub fn ser_write_journey_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_journey_input::ser_write_journey_request_payload(
         payload,
diff --git a/sdk/pinpoint/src/protocol_serde/shape_create_push_template_input.rs b/sdk/pinpoint/src/protocol_serde/shape_create_push_template_input.rs
index 17c780df729c..7f97948900bb 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_create_push_template_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_create_push_template_input.rs
@@ -4,7 +4,7 @@ pub fn ser_push_notification_template_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_push_template_input::ser_push_notification_template_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_create_recommender_configuration_input.rs b/sdk/pinpoint/src/protocol_serde/shape_create_recommender_configuration_input.rs
index ac90540c22c2..5d119f0108b3 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_create_recommender_configuration_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_create_recommender_configuration_input.rs
@@ -4,7 +4,7 @@ pub fn ser_create_recommender_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_recommender_configuration_input::ser_create_recommender_configuration_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_create_segment_input.rs b/sdk/pinpoint/src/protocol_serde/shape_create_segment_input.rs
index a20dde56439a..1cd16be9a7b5 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_create_segment_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_create_segment_input.rs
@@ -4,7 +4,7 @@ pub fn ser_write_segment_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_segment_input::ser_write_segment_request_payload(
         payload,
diff --git a/sdk/pinpoint/src/protocol_serde/shape_create_sms_template_input.rs b/sdk/pinpoint/src/protocol_serde/shape_create_sms_template_input.rs
index 401c2dc7b3b5..cc99b1c35642 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_create_sms_template_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_create_sms_template_input.rs
@@ -4,7 +4,7 @@ pub fn ser_sms_template_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_sms_template_input::ser_sms_template_request_payload(
         payload,
diff --git a/sdk/pinpoint/src/protocol_serde/shape_create_voice_template_input.rs b/sdk/pinpoint/src/protocol_serde/shape_create_voice_template_input.rs
index 407cc774cd53..47b87a8d276a 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_create_voice_template_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_create_voice_template_input.rs
@@ -4,7 +4,7 @@ pub fn ser_voice_template_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_voice_template_input::ser_voice_template_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_phone_number_validate_input.rs b/sdk/pinpoint/src/protocol_serde/shape_phone_number_validate_input.rs
index 85a6ab6a7d4c..6edb7641114c 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_phone_number_validate_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_phone_number_validate_input.rs
@@ -4,7 +4,7 @@ pub fn ser_number_validate_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_phone_number_validate_input::ser_number_validate_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_put_event_stream_input.rs b/sdk/pinpoint/src/protocol_serde/shape_put_event_stream_input.rs
index 13c56711f4fa..490e221232e1 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_put_event_stream_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_put_event_stream_input.rs
@@ -4,7 +4,7 @@ pub fn ser_write_event_stream_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_event_stream_input::ser_write_event_stream_payload(
         payload,
diff --git a/sdk/pinpoint/src/protocol_serde/shape_put_events_input.rs b/sdk/pinpoint/src/protocol_serde/shape_put_events_input.rs
index 516c745c2a58..898c5b555f63 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_put_events_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_put_events_input.rs
@@ -4,7 +4,7 @@ pub fn ser_events_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_events_input::ser_events_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_remove_attributes_input.rs b/sdk/pinpoint/src/protocol_serde/shape_remove_attributes_input.rs
index 4785abab5ae8..bb8cd4c5a2f0 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_remove_attributes_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_remove_attributes_input.rs
@@ -4,7 +4,7 @@ pub fn ser_update_attributes_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_remove_attributes_input::ser_update_attributes_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_send_messages_input.rs b/sdk/pinpoint/src/protocol_serde/shape_send_messages_input.rs
index d6531ec21fd0..93eddabaa0b5 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_send_messages_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_send_messages_input.rs
@@ -4,7 +4,7 @@ pub fn ser_message_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_send_messages_input::ser_message_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_send_otp_message_input.rs b/sdk/pinpoint/src/protocol_serde/shape_send_otp_message_input.rs
index 30a2bde6d2da..f67e901e5187 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_send_otp_message_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_send_otp_message_input.rs
@@ -4,7 +4,7 @@ pub fn ser_send_otp_message_request_parameters_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_send_otp_message_input::ser_send_otp_message_request_parameters_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_send_users_messages_input.rs b/sdk/pinpoint/src/protocol_serde/shape_send_users_messages_input.rs
index 9870e6442d11..d2fd40d409df 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_send_users_messages_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_send_users_messages_input.rs
@@ -4,7 +4,7 @@ pub fn ser_send_users_message_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_send_users_messages_input::ser_send_users_message_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_tag_resource_input.rs b/sdk/pinpoint/src/protocol_serde/shape_tag_resource_input.rs
index 0f40a652802c..038ea01405c6 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_tag_resource_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_tag_resource_input.rs
@@ -4,7 +4,7 @@ pub fn ser_tags_model_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_tag_resource_input::ser_tags_model_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_adm_channel_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_adm_channel_input.rs
index 9832042fcccb..00fcb9108f8a 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_adm_channel_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_adm_channel_input.rs
@@ -4,7 +4,7 @@ pub fn ser_adm_channel_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_adm_channel_input::ser_adm_channel_request_payload(
         payload,
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_apns_channel_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_apns_channel_input.rs
index 91281c26d9c0..113107856401 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_apns_channel_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_apns_channel_input.rs
@@ -4,7 +4,7 @@ pub fn ser_apns_channel_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_apns_channel_input::ser_apns_channel_request_payload(
         payload,
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_apns_sandbox_channel_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_apns_sandbox_channel_input.rs
index ab292c781ef2..3b501c531980 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_apns_sandbox_channel_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_apns_sandbox_channel_input.rs
@@ -4,7 +4,7 @@ pub fn ser_apns_sandbox_channel_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_apns_sandbox_channel_input::ser_apns_sandbox_channel_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_apns_voip_channel_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_apns_voip_channel_input.rs
index 75c86cd2c7b5..1eb043f8664d 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_apns_voip_channel_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_apns_voip_channel_input.rs
@@ -4,7 +4,7 @@ pub fn ser_apns_voip_channel_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_apns_voip_channel_input::ser_apns_voip_channel_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_apns_voip_sandbox_channel_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_apns_voip_sandbox_channel_input.rs
index 414c1d2347e6..d31866ded523 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_apns_voip_sandbox_channel_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_apns_voip_sandbox_channel_input.rs
@@ -4,7 +4,7 @@ pub fn ser_apns_voip_sandbox_channel_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_apns_voip_sandbox_channel_input::ser_apns_voip_sandbox_channel_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_application_settings_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_application_settings_input.rs
index 3ffb552a1179..d06d3d7e7976 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_application_settings_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_application_settings_input.rs
@@ -4,7 +4,7 @@ pub fn ser_write_application_settings_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_application_settings_input::ser_write_application_settings_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_baidu_channel_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_baidu_channel_input.rs
index 1bd6568c7815..286ce6c2a229 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_baidu_channel_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_baidu_channel_input.rs
@@ -4,7 +4,7 @@ pub fn ser_baidu_channel_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_baidu_channel_input::ser_baidu_channel_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_campaign_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_campaign_input.rs
index 454ec0af21c6..9f08808b951c 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_campaign_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_campaign_input.rs
@@ -4,7 +4,7 @@ pub fn ser_write_campaign_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_campaign_input::ser_write_campaign_request_payload(
         payload,
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_email_channel_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_email_channel_input.rs
index db7f5e5f45dc..11fb19bfb45e 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_email_channel_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_email_channel_input.rs
@@ -4,7 +4,7 @@ pub fn ser_email_channel_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_email_channel_input::ser_email_channel_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_email_template_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_email_template_input.rs
index 214c9bec9dd0..b2ec18a018c8 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_email_template_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_email_template_input.rs
@@ -4,7 +4,7 @@ pub fn ser_email_template_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_email_template_input::ser_email_template_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_endpoint_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_endpoint_input.rs
index ae8b2a4e536f..ad4d65f4756a 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_endpoint_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_endpoint_input.rs
@@ -4,7 +4,7 @@ pub fn ser_endpoint_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_endpoint_input::ser_endpoint_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_endpoints_batch_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_endpoints_batch_input.rs
index bc87cdd21ec3..68ac23cbaece 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_endpoints_batch_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_endpoints_batch_input.rs
@@ -4,7 +4,7 @@ pub fn ser_endpoint_batch_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_endpoints_batch_input::ser_endpoint_batch_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_gcm_channel_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_gcm_channel_input.rs
index abdc6bbf888f..4248e7559230 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_gcm_channel_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_gcm_channel_input.rs
@@ -4,7 +4,7 @@ pub fn ser_gcm_channel_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_gcm_channel_input::ser_gcm_channel_request_payload(
         payload,
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_in_app_template_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_in_app_template_input.rs
index 2bab814286cd..0a409619c29a 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_in_app_template_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_in_app_template_input.rs
@@ -4,7 +4,7 @@ pub fn ser_in_app_template_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_in_app_template_input::ser_in_app_template_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_journey_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_journey_input.rs
index ee318786dfec..d717d45af468 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_journey_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_journey_input.rs
@@ -4,7 +4,7 @@ pub fn ser_write_journey_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_journey_input::ser_write_journey_request_payload(
         payload,
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_journey_state_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_journey_state_input.rs
index cf7a2bf0a8da..f8722a284cc4 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_journey_state_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_journey_state_input.rs
@@ -4,7 +4,7 @@ pub fn ser_journey_state_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_journey_state_input::ser_journey_state_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_push_template_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_push_template_input.rs
index 35cce38c87ff..90b5537170e7 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_push_template_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_push_template_input.rs
@@ -4,7 +4,7 @@ pub fn ser_push_notification_template_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_push_template_input::ser_push_notification_template_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_recommender_configuration_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_recommender_configuration_input.rs
index 0875e39f9e3b..0f49ab5e0272 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_recommender_configuration_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_recommender_configuration_input.rs
@@ -4,7 +4,7 @@ pub fn ser_update_recommender_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_recommender_configuration_input::ser_update_recommender_configuration_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_segment_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_segment_input.rs
index d82c61ba61cb..036f4aac31c7 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_segment_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_segment_input.rs
@@ -4,7 +4,7 @@ pub fn ser_write_segment_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_segment_input::ser_write_segment_request_payload(
         payload,
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_sms_channel_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_sms_channel_input.rs
index 7b5a9c9b5543..7cb110cbd10d 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_sms_channel_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_sms_channel_input.rs
@@ -4,7 +4,7 @@ pub fn ser_sms_channel_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_sms_channel_input::ser_sms_channel_request_payload(
         payload,
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_sms_template_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_sms_template_input.rs
index 3b7cee14a192..4e1b0627b3f2 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_sms_template_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_sms_template_input.rs
@@ -4,7 +4,7 @@ pub fn ser_sms_template_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_sms_template_input::ser_sms_template_request_payload(
         payload,
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_template_active_version_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_template_active_version_input.rs
index dca5ca7d6fb4..d08b5ac5343d 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_template_active_version_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_template_active_version_input.rs
@@ -4,7 +4,7 @@ pub fn ser_template_active_version_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_template_active_version_input::ser_template_active_version_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_voice_channel_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_voice_channel_input.rs
index a0c8c05a0bb5..33f49ff6bbec 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_voice_channel_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_voice_channel_input.rs
@@ -4,7 +4,7 @@ pub fn ser_voice_channel_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_voice_channel_input::ser_voice_channel_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_update_voice_template_input.rs b/sdk/pinpoint/src/protocol_serde/shape_update_voice_template_input.rs
index 67ec47f27ae1..78dba6e550bb 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_update_voice_template_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_update_voice_template_input.rs
@@ -4,7 +4,7 @@ pub fn ser_voice_template_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_voice_template_input::ser_voice_template_request_payload(payload)?)
 }
diff --git a/sdk/pinpoint/src/protocol_serde/shape_verify_otp_message_input.rs b/sdk/pinpoint/src/protocol_serde/shape_verify_otp_message_input.rs
index 45cbf6590205..d325cb1ee365 100644
--- a/sdk/pinpoint/src/protocol_serde/shape_verify_otp_message_input.rs
+++ b/sdk/pinpoint/src/protocol_serde/shape_verify_otp_message_input.rs
@@ -4,7 +4,7 @@ pub fn ser_verify_otp_message_request_parameters_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_verify_otp_message_input::ser_verify_otp_message_request_parameters_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde.rs b/sdk/s3/src/protocol_serde.rs
index 657814b9a07a..26b27d193a57 100644
--- a/sdk/s3/src/protocol_serde.rs
+++ b/sdk/s3/src/protocol_serde.rs
@@ -37,7 +37,7 @@ pub(crate) mod shape_abort_multipart_upload;
 
 pub(crate) mod shape_complete_multipart_upload;
 
-pub fn rest_xml_unset_payload() -> ::std::vec::Vec<u8> {
+pub fn rest_xml_unset_struct_payload() -> ::std::vec::Vec<u8> {
     Vec::new()
 }
 
diff --git a/sdk/s3/src/protocol_serde/shape_complete_multipart_upload_input.rs b/sdk/s3/src/protocol_serde/shape_complete_multipart_upload_input.rs
index e5a8a7b14f56..0a1e76f09cb4 100644
--- a/sdk/s3/src/protocol_serde/shape_complete_multipart_upload_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_complete_multipart_upload_input.rs
@@ -4,7 +4,7 @@ pub fn ser_multipart_upload_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_complete_multipart_upload_input::ser_multipart_upload_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde/shape_create_bucket_input.rs b/sdk/s3/src/protocol_serde/shape_create_bucket_input.rs
index f0a8514849fe..c54696f4991b 100644
--- a/sdk/s3/src/protocol_serde/shape_create_bucket_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_create_bucket_input.rs
@@ -4,7 +4,7 @@ pub fn ser_create_bucket_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_bucket_input::ser_create_bucket_configuration_payload(
         payload,
diff --git a/sdk/s3/src/protocol_serde/shape_delete_objects_input.rs b/sdk/s3/src/protocol_serde/shape_delete_objects_input.rs
index 2836fac5ce0d..6aea4a9cdec5 100644
--- a/sdk/s3/src/protocol_serde/shape_delete_objects_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_delete_objects_input.rs
@@ -4,7 +4,7 @@ pub fn ser_delete_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_delete_objects_input::ser_delete_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde/shape_put_bucket_accelerate_configuration_input.rs b/sdk/s3/src/protocol_serde/shape_put_bucket_accelerate_configuration_input.rs
index 724f257d83c8..2952bdd302e8 100644
--- a/sdk/s3/src/protocol_serde/shape_put_bucket_accelerate_configuration_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_bucket_accelerate_configuration_input.rs
@@ -4,7 +4,7 @@ pub fn ser_accelerate_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_accelerate_configuration_input::ser_accelerate_configuration_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde/shape_put_bucket_acl_input.rs b/sdk/s3/src/protocol_serde/shape_put_bucket_acl_input.rs
index 30c62aa93076..0cf82b2169e3 100644
--- a/sdk/s3/src/protocol_serde/shape_put_bucket_acl_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_bucket_acl_input.rs
@@ -4,7 +4,7 @@ pub fn ser_access_control_policy_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_acl_input::ser_access_control_policy_payload(
         payload,
diff --git a/sdk/s3/src/protocol_serde/shape_put_bucket_analytics_configuration_input.rs b/sdk/s3/src/protocol_serde/shape_put_bucket_analytics_configuration_input.rs
index 686447878592..4b59ffde14d2 100644
--- a/sdk/s3/src/protocol_serde/shape_put_bucket_analytics_configuration_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_bucket_analytics_configuration_input.rs
@@ -4,7 +4,7 @@ pub fn ser_analytics_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_analytics_configuration_input::ser_analytics_configuration_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde/shape_put_bucket_cors_input.rs b/sdk/s3/src/protocol_serde/shape_put_bucket_cors_input.rs
index c6fa51ce6a43..551ccebd32e1 100644
--- a/sdk/s3/src/protocol_serde/shape_put_bucket_cors_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_bucket_cors_input.rs
@@ -4,7 +4,7 @@ pub fn ser_cors_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_cors_input::ser_cors_configuration_payload(
         payload,
diff --git a/sdk/s3/src/protocol_serde/shape_put_bucket_encryption_input.rs b/sdk/s3/src/protocol_serde/shape_put_bucket_encryption_input.rs
index 3985c2daa3f7..d30936c4b1e7 100644
--- a/sdk/s3/src/protocol_serde/shape_put_bucket_encryption_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_bucket_encryption_input.rs
@@ -4,7 +4,7 @@ pub fn ser_server_side_encryption_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_encryption_input::ser_server_side_encryption_configuration_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde/shape_put_bucket_intelligent_tiering_configuration_input.rs b/sdk/s3/src/protocol_serde/shape_put_bucket_intelligent_tiering_configuration_input.rs
index 9b92533af9de..154c382d021a 100644
--- a/sdk/s3/src/protocol_serde/shape_put_bucket_intelligent_tiering_configuration_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_bucket_intelligent_tiering_configuration_input.rs
@@ -4,7 +4,7 @@ pub fn ser_intelligent_tiering_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_intelligent_tiering_configuration_input::ser_intelligent_tiering_configuration_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde/shape_put_bucket_inventory_configuration_input.rs b/sdk/s3/src/protocol_serde/shape_put_bucket_inventory_configuration_input.rs
index b2033f42bd82..0778e614d948 100644
--- a/sdk/s3/src/protocol_serde/shape_put_bucket_inventory_configuration_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_bucket_inventory_configuration_input.rs
@@ -4,7 +4,7 @@ pub fn ser_inventory_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_inventory_configuration_input::ser_inventory_configuration_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde/shape_put_bucket_lifecycle_configuration_input.rs b/sdk/s3/src/protocol_serde/shape_put_bucket_lifecycle_configuration_input.rs
index b3bb24a34019..db2ca89895f5 100644
--- a/sdk/s3/src/protocol_serde/shape_put_bucket_lifecycle_configuration_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_bucket_lifecycle_configuration_input.rs
@@ -4,7 +4,7 @@ pub fn ser_lifecycle_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_lifecycle_configuration_input::ser_lifecycle_configuration_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde/shape_put_bucket_logging_input.rs b/sdk/s3/src/protocol_serde/shape_put_bucket_logging_input.rs
index 575c87f0bd71..8e665f53e1f8 100644
--- a/sdk/s3/src/protocol_serde/shape_put_bucket_logging_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_bucket_logging_input.rs
@@ -4,7 +4,7 @@ pub fn ser_bucket_logging_status_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_logging_input::ser_bucket_logging_status_payload(
         payload,
diff --git a/sdk/s3/src/protocol_serde/shape_put_bucket_metrics_configuration_input.rs b/sdk/s3/src/protocol_serde/shape_put_bucket_metrics_configuration_input.rs
index 755147c1c5ea..855375d930d6 100644
--- a/sdk/s3/src/protocol_serde/shape_put_bucket_metrics_configuration_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_bucket_metrics_configuration_input.rs
@@ -4,7 +4,7 @@ pub fn ser_metrics_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_metrics_configuration_input::ser_metrics_configuration_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde/shape_put_bucket_notification_configuration_input.rs b/sdk/s3/src/protocol_serde/shape_put_bucket_notification_configuration_input.rs
index 6d94a6346369..1ca384eaa0f0 100644
--- a/sdk/s3/src/protocol_serde/shape_put_bucket_notification_configuration_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_bucket_notification_configuration_input.rs
@@ -4,7 +4,7 @@ pub fn ser_notification_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_notification_configuration_input::ser_notification_configuration_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde/shape_put_bucket_ownership_controls_input.rs b/sdk/s3/src/protocol_serde/shape_put_bucket_ownership_controls_input.rs
index 6a85c7c299d1..7f935e1ca827 100644
--- a/sdk/s3/src/protocol_serde/shape_put_bucket_ownership_controls_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_bucket_ownership_controls_input.rs
@@ -4,7 +4,7 @@ pub fn ser_ownership_controls_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_ownership_controls_input::ser_ownership_controls_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde/shape_put_bucket_replication_input.rs b/sdk/s3/src/protocol_serde/shape_put_bucket_replication_input.rs
index e289384470be..e71e75cd41de 100644
--- a/sdk/s3/src/protocol_serde/shape_put_bucket_replication_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_bucket_replication_input.rs
@@ -4,7 +4,7 @@ pub fn ser_replication_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_replication_input::ser_replication_configuration_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde/shape_put_bucket_request_payment_input.rs b/sdk/s3/src/protocol_serde/shape_put_bucket_request_payment_input.rs
index e7284e172310..7467ea991c9a 100644
--- a/sdk/s3/src/protocol_serde/shape_put_bucket_request_payment_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_bucket_request_payment_input.rs
@@ -4,7 +4,7 @@ pub fn ser_request_payment_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_request_payment_input::ser_request_payment_configuration_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde/shape_put_bucket_tagging_input.rs b/sdk/s3/src/protocol_serde/shape_put_bucket_tagging_input.rs
index 2b968a25c1ea..a9afd9ccc323 100644
--- a/sdk/s3/src/protocol_serde/shape_put_bucket_tagging_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_bucket_tagging_input.rs
@@ -4,7 +4,7 @@ pub fn ser_tagging_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_tagging_input::ser_tagging_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde/shape_put_bucket_versioning_input.rs b/sdk/s3/src/protocol_serde/shape_put_bucket_versioning_input.rs
index a183620f0d79..d12248ac5673 100644
--- a/sdk/s3/src/protocol_serde/shape_put_bucket_versioning_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_bucket_versioning_input.rs
@@ -4,7 +4,7 @@ pub fn ser_versioning_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_versioning_input::ser_versioning_configuration_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde/shape_put_bucket_website_input.rs b/sdk/s3/src/protocol_serde/shape_put_bucket_website_input.rs
index 7d245d947323..4f27042ae591 100644
--- a/sdk/s3/src/protocol_serde/shape_put_bucket_website_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_bucket_website_input.rs
@@ -4,7 +4,7 @@ pub fn ser_website_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_website_input::ser_website_configuration_payload(
         payload,
diff --git a/sdk/s3/src/protocol_serde/shape_put_object_acl_input.rs b/sdk/s3/src/protocol_serde/shape_put_object_acl_input.rs
index 048dad4af180..c8f994ab7054 100644
--- a/sdk/s3/src/protocol_serde/shape_put_object_acl_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_object_acl_input.rs
@@ -4,7 +4,7 @@ pub fn ser_access_control_policy_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_object_acl_input::ser_access_control_policy_payload(
         payload,
diff --git a/sdk/s3/src/protocol_serde/shape_put_object_legal_hold_input.rs b/sdk/s3/src/protocol_serde/shape_put_object_legal_hold_input.rs
index a0e186dfc33c..d30d1d18ced4 100644
--- a/sdk/s3/src/protocol_serde/shape_put_object_legal_hold_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_object_legal_hold_input.rs
@@ -4,7 +4,7 @@ pub fn ser_legal_hold_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_object_legal_hold_input::ser_legal_hold_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde/shape_put_object_lock_configuration_input.rs b/sdk/s3/src/protocol_serde/shape_put_object_lock_configuration_input.rs
index c74e5b1339c0..a41fa6d3cec9 100644
--- a/sdk/s3/src/protocol_serde/shape_put_object_lock_configuration_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_object_lock_configuration_input.rs
@@ -4,7 +4,7 @@ pub fn ser_object_lock_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_object_lock_configuration_input::ser_object_lock_configuration_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde/shape_put_object_retention_input.rs b/sdk/s3/src/protocol_serde/shape_put_object_retention_input.rs
index f8c5aaa53008..2ad7c19da9ae 100644
--- a/sdk/s3/src/protocol_serde/shape_put_object_retention_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_object_retention_input.rs
@@ -4,7 +4,7 @@ pub fn ser_retention_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_object_retention_input::ser_retention_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde/shape_put_object_tagging_input.rs b/sdk/s3/src/protocol_serde/shape_put_object_tagging_input.rs
index 253e9ef5ead9..8c14fecb7f71 100644
--- a/sdk/s3/src/protocol_serde/shape_put_object_tagging_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_object_tagging_input.rs
@@ -4,7 +4,7 @@ pub fn ser_tagging_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_object_tagging_input::ser_tagging_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde/shape_put_public_access_block_input.rs b/sdk/s3/src/protocol_serde/shape_put_public_access_block_input.rs
index fd737da4a0c4..01dd5a5819f2 100644
--- a/sdk/s3/src/protocol_serde/shape_put_public_access_block_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_put_public_access_block_input.rs
@@ -4,7 +4,7 @@ pub fn ser_public_access_block_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_public_access_block_input::ser_public_access_block_configuration_payload(payload)?)
 }
diff --git a/sdk/s3/src/protocol_serde/shape_restore_object_input.rs b/sdk/s3/src/protocol_serde/shape_restore_object_input.rs
index 9bf1375d0141..7632a49531cd 100644
--- a/sdk/s3/src/protocol_serde/shape_restore_object_input.rs
+++ b/sdk/s3/src/protocol_serde/shape_restore_object_input.rs
@@ -4,7 +4,7 @@ pub fn ser_restore_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_restore_object_input::ser_restore_request_payload(payload)?)
 }
diff --git a/sdk/s3control/src/protocol_serde.rs b/sdk/s3control/src/protocol_serde.rs
index 3f79ccdeb981..e535c3598ed7 100644
--- a/sdk/s3control/src/protocol_serde.rs
+++ b/sdk/s3control/src/protocol_serde.rs
@@ -29,7 +29,7 @@ pub(crate) mod shape_create_access_point_for_object_lambda;
 
 pub(crate) mod shape_create_bucket;
 
-pub fn rest_xml_unset_payload() -> ::std::vec::Vec<u8> {
+pub fn rest_xml_unset_struct_payload() -> ::std::vec::Vec<u8> {
     Vec::new()
 }
 
diff --git a/sdk/s3control/src/protocol_serde/shape_create_bucket_input.rs b/sdk/s3control/src/protocol_serde/shape_create_bucket_input.rs
index e1f764d02ec9..83dfd7a0e7f1 100644
--- a/sdk/s3control/src/protocol_serde/shape_create_bucket_input.rs
+++ b/sdk/s3control/src/protocol_serde/shape_create_bucket_input.rs
@@ -4,7 +4,7 @@ pub fn ser_create_bucket_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_bucket_input::ser_create_bucket_configuration_payload(
         payload,
diff --git a/sdk/s3control/src/protocol_serde/shape_put_bucket_lifecycle_configuration_input.rs b/sdk/s3control/src/protocol_serde/shape_put_bucket_lifecycle_configuration_input.rs
index 158b243371ee..df5fe1484d05 100644
--- a/sdk/s3control/src/protocol_serde/shape_put_bucket_lifecycle_configuration_input.rs
+++ b/sdk/s3control/src/protocol_serde/shape_put_bucket_lifecycle_configuration_input.rs
@@ -4,7 +4,7 @@ pub fn ser_lifecycle_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_lifecycle_configuration_input::ser_lifecycle_configuration_payload(payload)?)
 }
diff --git a/sdk/s3control/src/protocol_serde/shape_put_bucket_replication_input.rs b/sdk/s3control/src/protocol_serde/shape_put_bucket_replication_input.rs
index 58451597f92c..544c7c219d93 100644
--- a/sdk/s3control/src/protocol_serde/shape_put_bucket_replication_input.rs
+++ b/sdk/s3control/src/protocol_serde/shape_put_bucket_replication_input.rs
@@ -4,7 +4,7 @@ pub fn ser_replication_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_replication_input::ser_replication_configuration_payload(payload)?)
 }
diff --git a/sdk/s3control/src/protocol_serde/shape_put_bucket_tagging_input.rs b/sdk/s3control/src/protocol_serde/shape_put_bucket_tagging_input.rs
index 7bb02a8f36c6..4e8f20cb989d 100644
--- a/sdk/s3control/src/protocol_serde/shape_put_bucket_tagging_input.rs
+++ b/sdk/s3control/src/protocol_serde/shape_put_bucket_tagging_input.rs
@@ -4,7 +4,7 @@ pub fn ser_tagging_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_tagging_input::ser_tagging_payload(payload)?)
 }
diff --git a/sdk/s3control/src/protocol_serde/shape_put_bucket_versioning_input.rs b/sdk/s3control/src/protocol_serde/shape_put_bucket_versioning_input.rs
index a9b855733851..302b561ce2a9 100644
--- a/sdk/s3control/src/protocol_serde/shape_put_bucket_versioning_input.rs
+++ b/sdk/s3control/src/protocol_serde/shape_put_bucket_versioning_input.rs
@@ -4,7 +4,7 @@ pub fn ser_versioning_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_bucket_versioning_input::ser_versioning_configuration_payload(payload)?)
 }
diff --git a/sdk/s3control/src/protocol_serde/shape_put_public_access_block_input.rs b/sdk/s3control/src/protocol_serde/shape_put_public_access_block_input.rs
index 4006962cf9b5..2f94359e2fa4 100644
--- a/sdk/s3control/src/protocol_serde/shape_put_public_access_block_input.rs
+++ b/sdk/s3control/src/protocol_serde/shape_put_public_access_block_input.rs
@@ -4,7 +4,7 @@ pub fn ser_public_access_block_configuration_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_public_access_block_input::ser_public_access_block_configuration_payload(payload)?)
 }
diff --git a/versions.toml b/versions.toml
index c4e35ef38d8a..a995c187cd0c 100644
--- a/versions.toml
+++ b/versions.toml
@@ -1,4 +1,4 @@
-smithy_rs_revision = 'f982b40edb378ea54a697b1163490ad0096f2d88'
+smithy_rs_revision = 'f6ded058bca17584643a291c502699d4b7a11f37'
 aws_doc_sdk_examples_revision = '577a55916047897a0ef2e2aac1e855dccc3614f9'
 
 [manual_interventions]
@@ -89,7 +89,7 @@ model_hash = 'd24bae0ca2f1a1d804545342cd396a5e45faf5ac659d269df2454b135ed578ad'
 [crates.aws-sdk-amplifyuibuilder]
 category = 'AwsSdk'
 version = '0.31.0'
-source_hash = '1ef785fd13cf31e190ac5c9f8e9277d92dcc5b0340a08c5552bc6bad4de9b25b'
+source_hash = '65d7624d5476bf0e21bdcce473e2f264f1f27795e03424d7840e7450c237725e'
 model_hash = '86377e4c6af76f9c6298eebdc39102ac85cfb5b18cc0bdf85c4e906728c99142'
 
 [crates.aws-sdk-apigateway]
@@ -329,7 +329,7 @@ model_hash = 'b1effe9557d59617ae37b75ce12214a744c612cea78c1c71bea7c1d25be9c78d'
 [crates.aws-sdk-cloudfront]
 category = 'AwsSdk'
 version = '0.31.0'
-source_hash = '0fcb3d549f945f6d5d47dbfe58d5cb1b804f84f153f52175c9e400474395be0e'
+source_hash = '80b7f0a20da2f2d766ea6a52bdadfe531710b3140636bf2c5fc9a277debd7ff3'
 model_hash = '5106b48f35ff12473566b93a17157d527fe54d5c5c5171341aef1795be99e07d'
 
 [crates.aws-sdk-cloudhsm]
@@ -851,7 +851,7 @@ model_hash = 'f20e54c6d35b007966a13823d72d6145a2b63f2d5151da62f64ca62b4a6d3b58'
 [crates.aws-sdk-glacier]
 category = 'AwsSdk'
 version = '0.31.0'
-source_hash = '56175fba23413150a9aff64a36802747a28b273575e8f8809bffa5969c526b79'
+source_hash = 'ef4b2a4f6d291aa802bbcd5bb92d90f5fdb6dd3b582d36f9699850dc47d91734'
 model_hash = 'd4cd7c2520c7e42b3dfadad24e10c1b2aac7d710100f22a2aad1e6083fb8d3a0'
 
 [crates.aws-sdk-globalaccelerator]
@@ -953,7 +953,7 @@ model_hash = '6d3e0f9002a611781946b9cc66b642e3df514ee5df3a39d348555b0b9954ed87'
 [crates.aws-sdk-iot]
 category = 'AwsSdk'
 version = '0.31.0'
-source_hash = '6662bb3c0c9a87f5befc872a5f49401933587f2678e773c00095862f2c24e0bc'
+source_hash = '9e7412dfeee03c389f632020953d4508dc54ef854dc9bdea255a0792947eb26b'
 model_hash = '8ddfc69676f923becb8ee3c2eeaa6e0c1ecf38a297165c493f40f2d985c91fb3'
 
 [crates.aws-sdk-iot1clickdevices]
@@ -1541,7 +1541,7 @@ model_hash = '43871e7644a12d2a146d56bbc9744ac37d46c1d0cc78cfd48d8e7d00c3ac5a08'
 [crates.aws-sdk-pinpoint]
 category = 'AwsSdk'
 version = '0.31.0'
-source_hash = '8ca9974fc3513dd268d1337e1715082b0f7a8969d788661daeacc7665dca6111'
+source_hash = '981c9a3b97905f32d3b27f919122b8f154317ac870cc502fc66bd3c9873fa0e3'
 model_hash = '72face4a0dd0865d9036278ff60cb8b865bf12890120e186bdccb95827a085cc'
 
 [crates.aws-sdk-pinpointemail]
@@ -1739,13 +1739,13 @@ model_hash = 'd11f297a298a582d1c675f789b6444fd28ae81200644918504d4aa9596d62ab0'
 [crates.aws-sdk-s3]
 category = 'AwsSdk'
 version = '0.31.0'
-source_hash = 'a44efa8784064e7d39850d1a879ffeb974e018b74849e82ddc0fb12136d3a0b6'
+source_hash = '4467a610d13058ff34248e7c82f270c14acf236d93ba6eb84199fb8d48d7f874'
 model_hash = 'ad2334bb33680ba49ef315da2d419830ef6530c9ba3a769a3bd7f366eeeee414'
 
 [crates.aws-sdk-s3control]
 category = 'AwsSdk'
 version = '0.31.0'
-source_hash = '530bad28283fd4e3358d91f98bd48767edc9d0ffff2c92c776bf1c5e3022ec5e'
+source_hash = '942084a71b48104ad22f1a3cca0c90684b4494347f8494e7b0ea7d96a3fce0d5'
 model_hash = '91d392f712bc3894dc10384dc4b49b82664dac5be2e63c23c49c41aa7ee27820'
 
 [crates.aws-sdk-s3outposts]