From 1732fba36cecf8c483c0973ae865cd0fa3eae87e Mon Sep 17 00:00:00 2001
From: Peter Song <petesong@amazon.com>
Date: Tue, 19 Nov 2024 14:23:40 -0800
Subject: [PATCH] Custom updates for S3

---
 .../AbortIncompleteMultipartUploadUnmarshaller.cs             | 2 +-
 .../AccessControlTranslationUnmarshaller.cs                   | 2 +-
 .../AnalyticsConfigurationUnmarshaller.cs                     | 2 +-
 .../AnalyticsExportDestinationUnmarshaller.cs                 | 2 +-
 .../AnalyticsPredicateListUnmarshaller.cs                     | 2 +-
 .../AnalyticsS3BucketDestinationUnmarshaller.cs               | 2 +-
 .../BucketAlreadyExistsExceptionUnmarshaller.cs               | 2 +-
 .../BucketAlreadyOwnedByYouExceptionUnmarshaller.cs           | 2 +-
 .../Internal/MarshallTransformations/BucketUnmarshaller.cs    | 2 +-
 .../Internal/MarshallTransformations/CORSRuleUnmarshaller.cs  | 2 +-
 .../Internal/MarshallTransformations/ChecksumUnmarshaller.cs  | 2 +-
 .../CloudFunctionConfigurationUnmarshaller.cs                 | 2 +-
 .../MarshallTransformations/CommonPrefixesItemUnmarshaller.cs | 2 +-
 .../MarshallTransformations/ContentsItemUnmarshaller.cs       | 2 +-
 .../CreateSessionResponseUnmarshaller.cs                      | 2 +-
 .../MarshallTransformations/DefaultRetentionUnmarshaller.cs   | 2 +-
 .../DeleteMarkerReplicationUnmarshaller.cs                    | 2 +-
 .../MarshallTransformations/DeletedItemUnmarshaller.cs        | 2 +-
 .../EncryptionConfigurationUnmarshaller.cs                    | 2 +-
 .../MarshallTransformations/ErrorsItemUnmarshaller.cs         | 2 +-
 .../EventBridgeConfigurationUnmarshaller.cs                   | 2 +-
 .../ExistingObjectReplicationUnmarshaller.cs                  | 2 +-
 .../MarshallTransformations/ExpirationUnmarshaller.cs         | 2 +-
 .../MarshallTransformations/FilterRuleUnmarshaller.cs         | 2 +-
 .../Internal/MarshallTransformations/FilterUnmarshaller.cs    | 2 +-
 .../GetObjectAttributesPartsUnmarshaller.cs                   | 2 +-
 .../Internal/MarshallTransformations/GrantUnmarshaller.cs     | 2 +-
 .../Internal/MarshallTransformations/GranteeUnmarshaller.cs   | 2 +-
 .../MarshallTransformations/HeadBucketResponseUnmarshaller.cs | 2 +-
 .../Internal/MarshallTransformations/InitiatorUnmarshaller.cs | 2 +-
 .../IntelligentTieringConfigurationUnmarshaller.cs            | 2 +-
 .../IntelligentTieringPredicateListUnmarshaller.cs            | 2 +-
 .../InventoryConfigurationUnmarshaller.cs                     | 2 +-
 .../InventoryDestinationUnmarshaller.cs                       | 2 +-
 .../InventoryEncryptionUnmarshaller.cs                        | 2 +-
 .../MarshallTransformations/InventoryFilterUnmarshaller.cs    | 2 +-
 .../InventoryS3BucketDestinationUnmarshaller.cs               | 2 +-
 .../MarshallTransformations/InventoryScheduleUnmarshaller.cs  | 2 +-
 .../LifecycleFilterPredicateListUnmarshaller.cs               | 4 ++--
 .../LifecycleRuleNoncurrentVersionExpirationUnmarshaller.cs   | 2 +-
 .../LifecycleRuleNoncurrentVersionTransitionUnmarshaller.cs   | 2 +-
 .../ListDirectoryBucketsResponseUnmarshaller.cs               | 2 +-
 .../MarshallTransformations/LoggingEnabledUnmarshaller.cs     | 2 +-
 .../MetricsConfigurationUnmarshaller.cs                       | 2 +-
 .../MetricsPredicateListUnmarshaller.cs                       | 2 +-
 .../Internal/MarshallTransformations/MetricsUnmarshaller.cs   | 2 +-
 .../MarshallTransformations/MultipartUploadUnmarshaller.cs    | 2 +-
 .../NoSuchAccesspointExceptionUnmarshaller.cs                 | 2 +-
 .../NoSuchBucketExceptionUnmarshaller.cs                      | 2 +-
 .../ObjectLockConfigurationUnmarshaller.cs                    | 2 +-
 .../ObjectLockLegalHoldUnmarshaller.cs                        | 2 +-
 .../ObjectLockRetentionUnmarshaller.cs                        | 2 +-
 .../MarshallTransformations/ObjectLockRuleUnmarshaller.cs     | 2 +-
 .../MarshallTransformations/ObjectPartUnmarshaller.cs         | 2 +-
 .../Internal/MarshallTransformations/OwnerUnmarshaller.cs     | 2 +-
 .../OwnershipControlsRuleUnmarshaller.cs                      | 2 +-
 .../MarshallTransformations/PartDetailUnmarshaller.cs         | 2 +-
 .../MarshallTransformations/PartitionedPrefixUnmarshaller.cs  | 2 +-
 .../MarshallTransformations/PolicyStatusUnmarshaller.cs       | 2 +-
 .../PublicBlockConfigurationUnmarshaller.cs                   | 2 +-
 .../MarshallTransformations/PutBucketResponseUnmarshaller.cs  | 2 +-
 .../MarshallTransformations/QueueConfigurationUnmarshaller.cs | 2 +-
 .../ReplicaModificationsUnmarshaller.cs                       | 2 +-
 .../ReplicationDestinationUnmarshaller.cs                     | 2 +-
 .../ReplicationRuleAndOperatorUnmarshaller.cs                 | 2 +-
 .../ReplicationRuleFilterUnmarshaller.cs                      | 2 +-
 .../MarshallTransformations/ReplicationRuleUnmarshaller.cs    | 2 +-
 .../MarshallTransformations/ReplicationTimeUnmarshaller.cs    | 2 +-
 .../ReplicationTimeValueUnmarshaller.cs                       | 2 +-
 .../MarshallTransformations/RestoreStatusUnmarshaller.cs      | 2 +-
 .../RoutingRuleConditionUnmarshaller.cs                       | 2 +-
 .../RoutingRuleRedirectUnmarshaller.cs                        | 2 +-
 .../MarshallTransformations/RoutingRuleUnmarshaller.cs        | 2 +-
 .../Internal/MarshallTransformations/RulesItemUnmarshaller.cs | 2 +-
 .../MarshallTransformations/S3ErrorResponseUnmarshaller.cs    | 2 +-
 .../MarshallTransformations/S3KeyFilterUnmarshaller.cs        | 2 +-
 .../Internal/MarshallTransformations/SSEKMSUnmarshaller.cs    | 2 +-
 .../Internal/MarshallTransformations/SSES3Unmarshaller.cs     | 2 +-
 .../ServerSideEncryptionByDefaultUnmarshaller.cs              | 2 +-
 .../ServerSideEncryptionRuleUnmarshaller.cs                   | 2 +-
 .../MarshallTransformations/SessionCredentialsUnmarshaller.cs | 2 +-
 .../MarshallTransformations/SimplePrefixUnmarshaller.cs       | 2 +-
 .../SourceSelectionCriteriaUnmarshaller.cs                    | 2 +-
 .../SseKmsEncryptedObjectsUnmarshaller.cs                     | 2 +-
 .../StorageClassAnalysisDataExportUnmarshaller.cs             | 2 +-
 .../StorageClassAnalysisUnmarshaller.cs                       | 2 +-
 .../Model/Internal/MarshallTransformations/TagUnmarshaller.cs | 2 +-
 .../TargetObjectKeyFormatUnmarshaller.cs                      | 2 +-
 .../Internal/MarshallTransformations/TieringUnmarshaller.cs   | 2 +-
 .../MarshallTransformations/TopicConfigurationUnmarshaller.cs | 2 +-
 .../MarshallTransformations/TransitionUnmarshaller.cs         | 2 +-
 .../MarshallTransformations/VersionsItemUnmarshaller.cs       | 2 +-
 92 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AbortIncompleteMultipartUploadUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AbortIncompleteMultipartUploadUnmarshaller.cs
index 9b7352961336..5b768002d1c0 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AbortIncompleteMultipartUploadUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AbortIncompleteMultipartUploadUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   AbortIncompleteMultipartUpload Unmarshaller
      /// </summary>
-    public class AbortIncompleteMultipartUploadUnmarshaller : IUnmarshaller<LifecycleRuleAbortIncompleteMultipartUpload, XmlUnmarshallerContext>, IUnmarshaller<LifecycleRuleAbortIncompleteMultipartUpload, JsonUnmarshallerContext> 
+    public class AbortIncompleteMultipartUploadUnmarshaller : IXmlUnmarshaller<LifecycleRuleAbortIncompleteMultipartUpload, XmlUnmarshallerContext>, IXmlUnmarshaller<LifecycleRuleAbortIncompleteMultipartUpload, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Invoke the unmarshaller
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AccessControlTranslationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AccessControlTranslationUnmarshaller.cs
index 8697c1fa55a3..e66eb344017a 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AccessControlTranslationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AccessControlTranslationUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// AccessControlTranslation unmarshaller
     /// </summary>
-    public class AccessControlTranslationUnmarshaller : IUnmarshaller<AccessControlTranslation, XmlUnmarshallerContext>, IUnmarshaller<AccessControlTranslation, JsonUnmarshallerContext>
+    public class AccessControlTranslationUnmarshaller : IXmlUnmarshaller<AccessControlTranslation, XmlUnmarshallerContext>, IXmlUnmarshaller<AccessControlTranslation, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AnalyticsConfigurationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AnalyticsConfigurationUnmarshaller.cs
index 8c26485fc464..4fead8a6faed 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AnalyticsConfigurationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AnalyticsConfigurationUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// AnalyticsConfiguration Unmarshaller
     /// </summary>
-    public class AnalyticsConfigurationUnmarshaller : IUnmarshaller<AnalyticsConfiguration, XmlUnmarshallerContext>, IUnmarshaller<AnalyticsConfiguration, JsonUnmarshallerContext>
+    public class AnalyticsConfigurationUnmarshaller : IXmlUnmarshaller<AnalyticsConfiguration, XmlUnmarshallerContext>, IXmlUnmarshaller<AnalyticsConfiguration, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AnalyticsExportDestinationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AnalyticsExportDestinationUnmarshaller.cs
index 51e903391aa8..c7268f09829e 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AnalyticsExportDestinationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AnalyticsExportDestinationUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// AnalyticsExportDestinationUnmarshaller
     /// </summary>
-    public class AnalyticsExportDestinationUnmarshaller : IUnmarshaller<AnalyticsExportDestination, XmlUnmarshallerContext>, IUnmarshaller<AnalyticsExportDestination, JsonUnmarshallerContext>
+    public class AnalyticsExportDestinationUnmarshaller : IXmlUnmarshaller<AnalyticsExportDestination, XmlUnmarshallerContext>, IXmlUnmarshaller<AnalyticsExportDestination, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AnalyticsPredicateListUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AnalyticsPredicateListUnmarshaller.cs
index 04b186baa766..efcbb10b39f2 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AnalyticsPredicateListUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AnalyticsPredicateListUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     ///   AnalyticsFilter Unmarshaller
     /// </summary>
-    public class AnalyticsPredicateListUnmarshaller : IUnmarshaller<List<AnalyticsFilterPredicate>, XmlUnmarshallerContext>, IUnmarshaller<List<AnalyticsFilterPredicate>, JsonUnmarshallerContext>
+    public class AnalyticsPredicateListUnmarshaller : IXmlUnmarshaller<List<AnalyticsFilterPredicate>, XmlUnmarshallerContext>, IXmlUnmarshaller<List<AnalyticsFilterPredicate>, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AnalyticsS3BucketDestinationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AnalyticsS3BucketDestinationUnmarshaller.cs
index 0c2f2a7b5261..ca67fa963ef7 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AnalyticsS3BucketDestinationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AnalyticsS3BucketDestinationUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     ///   AnalyticsS3BucketDestination Unmarshaller
     /// </summary>
-    public class AnalyticsS3BucketDestinationUnmarshaller : IUnmarshaller<AnalyticsS3BucketDestination, XmlUnmarshallerContext>, IUnmarshaller<AnalyticsS3BucketDestination, JsonUnmarshallerContext>
+    public class AnalyticsS3BucketDestinationUnmarshaller : IXmlUnmarshaller<AnalyticsS3BucketDestination, XmlUnmarshallerContext>, IXmlUnmarshaller<AnalyticsS3BucketDestination, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/BucketAlreadyExistsExceptionUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/BucketAlreadyExistsExceptionUnmarshaller.cs
index 2866f65b26d5..68368378cb72 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/BucketAlreadyExistsExceptionUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/BucketAlreadyExistsExceptionUnmarshaller.cs
@@ -35,7 +35,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for BucketAlreadyExistsException operation
     /// </summary>  
-    public class BucketAlreadyExistsExceptionUnmarshaller : IErrorResponseUnmarshaller<BucketAlreadyExistsException, XmlUnmarshallerContext>
+    public class BucketAlreadyExistsExceptionUnmarshaller : IXmlErrorResponseUnmarshaller<BucketAlreadyExistsException, XmlUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/BucketAlreadyOwnedByYouExceptionUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/BucketAlreadyOwnedByYouExceptionUnmarshaller.cs
index a39dc8f58683..c18d42c478eb 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/BucketAlreadyOwnedByYouExceptionUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/BucketAlreadyOwnedByYouExceptionUnmarshaller.cs
@@ -35,7 +35,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for BucketAlreadyOwnedByYouException operation
     /// </summary>  
-    public class BucketAlreadyOwnedByYouExceptionUnmarshaller : IErrorResponseUnmarshaller<BucketAlreadyOwnedByYouException, XmlUnmarshallerContext>
+    public class BucketAlreadyOwnedByYouExceptionUnmarshaller : IXmlErrorResponseUnmarshaller<BucketAlreadyOwnedByYouException, XmlUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/BucketUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/BucketUnmarshaller.cs
index 83b7568adf0c..32eadebf3a78 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/BucketUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/BucketUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   Bucket Unmarshaller
      /// </summary>
-    public class BucketUnmarshaller : IUnmarshaller<S3Bucket, XmlUnmarshallerContext>, IUnmarshaller<S3Bucket, JsonUnmarshallerContext> 
+    public class BucketUnmarshaller : IXmlUnmarshaller<S3Bucket, XmlUnmarshallerContext>, IXmlUnmarshaller<S3Bucket, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CORSRuleUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CORSRuleUnmarshaller.cs
index 77f5ff5964ed..9b31e7a29138 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CORSRuleUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CORSRuleUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   CORSRule Unmarshaller
      /// </summary>
-    public class CORSRuleUnmarshaller : IUnmarshaller<CORSRule, XmlUnmarshallerContext>, IUnmarshaller<CORSRule, JsonUnmarshallerContext> 
+    public class CORSRuleUnmarshaller : IXmlUnmarshaller<CORSRule, XmlUnmarshallerContext>, IXmlUnmarshaller<CORSRule, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ChecksumUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ChecksumUnmarshaller.cs
index 4d8f8db49e36..bb16b2a7d563 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ChecksumUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ChecksumUnmarshaller.cs
@@ -32,7 +32,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for Checksum Object
     /// </summary>  
-    public class ChecksumUnmarshaller : IUnmarshaller<Checksum, XmlUnmarshallerContext>
+    public class ChecksumUnmarshaller : IXmlUnmarshaller<Checksum, XmlUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CloudFunctionConfigurationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CloudFunctionConfigurationUnmarshaller.cs
index e540c91f0b4c..e1d2409aa7c3 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CloudFunctionConfigurationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CloudFunctionConfigurationUnmarshaller.cs
@@ -24,7 +24,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// LambdaFunction unmarshaller
     /// </summary>
-    public class LambdaFunctionConfigurationUnmarshaller : IUnmarshaller<LambdaFunctionConfiguration, XmlUnmarshallerContext>, IUnmarshaller<LambdaFunctionConfiguration, JsonUnmarshallerContext> 
+    public class LambdaFunctionConfigurationUnmarshaller : IXmlUnmarshaller<LambdaFunctionConfiguration, XmlUnmarshallerContext>, IXmlUnmarshaller<LambdaFunctionConfiguration, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CommonPrefixesItemUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CommonPrefixesItemUnmarshaller.cs
index 67c587527537..93dc3f91803c 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CommonPrefixesItemUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CommonPrefixesItemUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   CommonPrefixesItem Unmarshaller
      /// </summary>
-    public class CommonPrefixesItemUnmarshaller : IUnmarshaller<string, XmlUnmarshallerContext>, IUnmarshaller<string, JsonUnmarshallerContext> 
+    public class CommonPrefixesItemUnmarshaller : IXmlUnmarshaller<string, XmlUnmarshallerContext>, IXmlUnmarshaller<string, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ContentsItemUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ContentsItemUnmarshaller.cs
index d697e26832d8..1cf3a72357e1 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ContentsItemUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ContentsItemUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   ContentsItem Unmarshaller
      /// </summary>
-    public class ContentsItemUnmarshaller : IUnmarshaller<S3Object, XmlUnmarshallerContext>, IUnmarshaller<S3Object, JsonUnmarshallerContext> 
+    public class ContentsItemUnmarshaller : IXmlUnmarshaller<S3Object, XmlUnmarshallerContext>, IXmlUnmarshaller<S3Object, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CreateSessionResponseUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CreateSessionResponseUnmarshaller.cs
index dd000881f10a..aea7c9051d87 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CreateSessionResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CreateSessionResponseUnmarshaller.cs
@@ -97,7 +97,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, CreateSessi
         /// <returns></returns>
         public override AmazonServiceException UnmarshallException(XmlUnmarshallerContext context, Exception innerException, HttpStatusCode statusCode)
         {
-            ErrorResponse errorResponse = ErrorResponseUnmarshaller.GetInstance().Unmarshall(context);
+            ErrorResponse errorResponse = XmlErrorResponseUnmarshaller.GetInstance().Unmarshall(context);
             errorResponse.InnerException = innerException;
             errorResponse.StatusCode = statusCode;
 
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/DefaultRetentionUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/DefaultRetentionUnmarshaller.cs
index 68381c009160..dd3579ed5a53 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/DefaultRetentionUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/DefaultRetentionUnmarshaller.cs
@@ -35,7 +35,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for DefaultRetention Object
     /// </summary>  
-    public class DefaultRetentionUnmarshaller : IUnmarshaller<DefaultRetention, XmlUnmarshallerContext>, IUnmarshaller<DefaultRetention, JsonUnmarshallerContext>
+    public class DefaultRetentionUnmarshaller : IXmlUnmarshaller<DefaultRetention, XmlUnmarshallerContext>, IXmlUnmarshaller<DefaultRetention, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/DeleteMarkerReplicationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/DeleteMarkerReplicationUnmarshaller.cs
index f3995304868b..ed21f330469f 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/DeleteMarkerReplicationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/DeleteMarkerReplicationUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// DeleteMarkerReplication unmarshaller
     /// </summary>
-    public class DeleteMarkerReplicationUnmarshaller : IUnmarshaller<DeleteMarkerReplication, XmlUnmarshallerContext>
+    public class DeleteMarkerReplicationUnmarshaller : IXmlUnmarshaller<DeleteMarkerReplication, XmlUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/DeletedItemUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/DeletedItemUnmarshaller.cs
index cf8227b8d8bc..2853af7af83a 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/DeletedItemUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/DeletedItemUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
     ///   DeletedObject Unmarshaller
      /// </summary>
-    public class DeletedObjectUnmarshaller : IUnmarshaller<DeletedObject, XmlUnmarshallerContext>, IUnmarshaller<DeletedObject, JsonUnmarshallerContext> 
+    public class DeletedObjectUnmarshaller : IXmlUnmarshaller<DeletedObject, XmlUnmarshallerContext>, IXmlUnmarshaller<DeletedObject, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/EncryptionConfigurationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/EncryptionConfigurationUnmarshaller.cs
index ca24c1310b88..53da9dee1f15 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/EncryptionConfigurationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/EncryptionConfigurationUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// EncryptionConfiguration unmarshaller
     /// </summary>
-    public class EncryptionConfigurationUnmarshaller : IUnmarshaller<EncryptionConfiguration, XmlUnmarshallerContext>, IUnmarshaller<EncryptionConfiguration, JsonUnmarshallerContext>
+    public class EncryptionConfigurationUnmarshaller : IXmlUnmarshaller<EncryptionConfiguration, XmlUnmarshallerContext>, IXmlUnmarshaller<EncryptionConfiguration, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ErrorsItemUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ErrorsItemUnmarshaller.cs
index b486b9aedfed..ad4b3d81b4ba 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ErrorsItemUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ErrorsItemUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   ErrorsItem Unmarshaller
      /// </summary>
-    public class ErrorsItemUnmarshaller : IUnmarshaller<DeleteError, XmlUnmarshallerContext>, IUnmarshaller<DeleteError, JsonUnmarshallerContext> 
+    public class ErrorsItemUnmarshaller : IXmlUnmarshaller<DeleteError, XmlUnmarshallerContext>, IXmlUnmarshaller<DeleteError, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/EventBridgeConfigurationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/EventBridgeConfigurationUnmarshaller.cs
index c97765062aba..a88e83a7c3f1 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/EventBridgeConfigurationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/EventBridgeConfigurationUnmarshaller.cs
@@ -32,7 +32,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for EventBridgeConfiguration Object
     /// </summary>  
-    public class EventBridgeConfigurationUnmarshaller : IUnmarshaller<EventBridgeConfiguration, XmlUnmarshallerContext>
+    public class EventBridgeConfigurationUnmarshaller : IXmlUnmarshaller<EventBridgeConfiguration, XmlUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ExistingObjectReplicationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ExistingObjectReplicationUnmarshaller.cs
index a189ef85f9c1..2ba62e1df6ba 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ExistingObjectReplicationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ExistingObjectReplicationUnmarshaller.cs
@@ -21,7 +21,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// ExistingObjectReplication unmarshaller
     /// </summary>
-    public class ExistingObjectReplicationUnmarshaller : IUnmarshaller<ExistingObjectReplication, XmlUnmarshallerContext>, IUnmarshaller<ExistingObjectReplication, JsonUnmarshallerContext>
+    public class ExistingObjectReplicationUnmarshaller : IXmlUnmarshaller<ExistingObjectReplication, XmlUnmarshallerContext>, IXmlUnmarshaller<ExistingObjectReplication, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ExpirationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ExpirationUnmarshaller.cs
index 36e413a2fe0d..e4eca108b594 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ExpirationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ExpirationUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   Expiration Unmarshaller
      /// </summary>
-    public class ExpirationUnmarshaller : IUnmarshaller<LifecycleRuleExpiration, XmlUnmarshallerContext>, IUnmarshaller<LifecycleRuleExpiration, JsonUnmarshallerContext> 
+    public class ExpirationUnmarshaller : IXmlUnmarshaller<LifecycleRuleExpiration, XmlUnmarshallerContext>, IXmlUnmarshaller<LifecycleRuleExpiration, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/FilterRuleUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/FilterRuleUnmarshaller.cs
index 722806206871..ae0cccf6075b 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/FilterRuleUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/FilterRuleUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
     ///   FilterRule Unmarshaller
      /// </summary>
-    public class FilterRuleUnmarshaller : IUnmarshaller<FilterRule, XmlUnmarshallerContext>, IUnmarshaller<FilterRule, JsonUnmarshallerContext> 
+    public class FilterRuleUnmarshaller : IXmlUnmarshaller<FilterRule, XmlUnmarshallerContext>, IXmlUnmarshaller<FilterRule, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/FilterUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/FilterUnmarshaller.cs
index cf014e770260..10145a11a35f 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/FilterUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/FilterUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   Filter Unmarshaller
      /// </summary>
-    public class FilterUnmarshaller : IUnmarshaller<Filter, XmlUnmarshallerContext>, IUnmarshaller<Filter, JsonUnmarshallerContext> 
+    public class FilterUnmarshaller : IXmlUnmarshaller<Filter, XmlUnmarshallerContext>, IXmlUnmarshaller<Filter, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectAttributesPartsUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectAttributesPartsUnmarshaller.cs
index adf6ec993b24..37d8bd9cb6e5 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectAttributesPartsUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectAttributesPartsUnmarshaller.cs
@@ -32,7 +32,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetObjectAttributesParts Object
     /// </summary>  
-    public class GetObjectAttributesPartsUnmarshaller : IUnmarshaller<GetObjectAttributesParts, XmlUnmarshallerContext>
+    public class GetObjectAttributesPartsUnmarshaller : IXmlUnmarshaller<GetObjectAttributesParts, XmlUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GrantUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GrantUnmarshaller.cs
index a10d6dc9da02..1e9fa044e60f 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GrantUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GrantUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   Grant Unmarshaller
      /// </summary>
-    public class GrantUnmarshaller : IUnmarshaller<S3Grant, XmlUnmarshallerContext>, IUnmarshaller<S3Grant, JsonUnmarshallerContext> 
+    public class GrantUnmarshaller : IXmlUnmarshaller<S3Grant, XmlUnmarshallerContext>, IXmlUnmarshaller<S3Grant, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GranteeUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GranteeUnmarshaller.cs
index d7e81589f2ec..b87ec7c48a04 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GranteeUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GranteeUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   Grantee Unmarshaller
      /// </summary>
-    public class GranteeUnmarshaller : IUnmarshaller<S3Grantee, XmlUnmarshallerContext>, IUnmarshaller<S3Grantee, JsonUnmarshallerContext> 
+    public class GranteeUnmarshaller : IXmlUnmarshaller<S3Grantee, XmlUnmarshallerContext>, IXmlUnmarshaller<S3Grantee, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/HeadBucketResponseUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/HeadBucketResponseUnmarshaller.cs
index 7ad4ba4553a1..b70424c09d8d 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/HeadBucketResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/HeadBucketResponseUnmarshaller.cs
@@ -70,7 +70,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, HeadBucketR
         /// <returns></returns>
         public override AmazonServiceException UnmarshallException(XmlUnmarshallerContext context, Exception innerException, HttpStatusCode statusCode)
         {
-            ErrorResponse errorResponse = ErrorResponseUnmarshaller.GetInstance().Unmarshall(context);
+            ErrorResponse errorResponse = XmlErrorResponseUnmarshaller.GetInstance().Unmarshall(context);
             errorResponse.InnerException = innerException;
             errorResponse.StatusCode = statusCode;
 
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InitiatorUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InitiatorUnmarshaller.cs
index 14671416fc05..072b79b360a3 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InitiatorUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InitiatorUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   Initiator Unmarshaller
      /// </summary>
-    public class InitiatorUnmarshaller : IUnmarshaller<Initiator, XmlUnmarshallerContext>, IUnmarshaller<Initiator, JsonUnmarshallerContext> 
+    public class InitiatorUnmarshaller : IXmlUnmarshaller<Initiator, XmlUnmarshallerContext>, IXmlUnmarshaller<Initiator, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/IntelligentTieringConfigurationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/IntelligentTieringConfigurationUnmarshaller.cs
index 9c98a70c911f..8c62a5a4cefe 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/IntelligentTieringConfigurationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/IntelligentTieringConfigurationUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Unmarshaller for IntelligentTieringConfiguration
     /// </summary>   
-    public class IntelligentTieringConfigurationUnmarshaller : IUnmarshaller<IntelligentTieringConfiguration, XmlUnmarshallerContext>, IUnmarshaller<IntelligentTieringConfiguration, JsonUnmarshallerContext>
+    public class IntelligentTieringConfigurationUnmarshaller : IXmlUnmarshaller<IntelligentTieringConfiguration, XmlUnmarshallerContext>, IXmlUnmarshaller<IntelligentTieringConfiguration, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/IntelligentTieringPredicateListUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/IntelligentTieringPredicateListUnmarshaller.cs
index 536bfccc55b7..ac9320aee209 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/IntelligentTieringPredicateListUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/IntelligentTieringPredicateListUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
 	/// <summary>
 	/// IntelligentTieringFilter Unmarshaller 
 	/// </summary>  
-	public class IntelligentTieringPredicateListFilterUnmarshaller : IUnmarshaller<List<IntelligentTieringFilterPredicate>, XmlUnmarshallerContext>, IUnmarshaller<List<IntelligentTieringFilterPredicate>, JsonUnmarshallerContext>
+	public class IntelligentTieringPredicateListFilterUnmarshaller : IXmlUnmarshaller<List<IntelligentTieringFilterPredicate>, XmlUnmarshallerContext>, IXmlUnmarshaller<List<IntelligentTieringFilterPredicate>, JsonUnmarshallerContext>
 	{
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryConfigurationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryConfigurationUnmarshaller.cs
index 9eedcc76cc4b..96e074a5dc53 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryConfigurationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryConfigurationUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     ///   InventoryConfiguration Unmarshaller
     /// </summary>
-    public class InventoryConfigurationUnmarshaller : IUnmarshaller<InventoryConfiguration, XmlUnmarshallerContext>, IUnmarshaller<InventoryConfiguration, JsonUnmarshallerContext> 
+    public class InventoryConfigurationUnmarshaller : IXmlUnmarshaller<InventoryConfiguration, XmlUnmarshallerContext>, IXmlUnmarshaller<InventoryConfiguration, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryDestinationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryDestinationUnmarshaller.cs
index 45b60aaddd10..a5c6bb75abeb 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryDestinationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryDestinationUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     ///   InventoryDestination Unmarshaller
     /// </summary>
-    public class InventoryDestinationUnmarshaller : IUnmarshaller<InventoryDestination, XmlUnmarshallerContext>, IUnmarshaller<InventoryDestination, JsonUnmarshallerContext> 
+    public class InventoryDestinationUnmarshaller : IXmlUnmarshaller<InventoryDestination, XmlUnmarshallerContext>, IXmlUnmarshaller<InventoryDestination, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryEncryptionUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryEncryptionUnmarshaller.cs
index 23618462fa7a..c33141a63fde 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryEncryptionUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryEncryptionUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     ///   InventoryEncryption Unmarshaller
     /// </summary>
-    public class InventoryEncryptionUnmarshaller : IUnmarshaller<InventoryEncryption, XmlUnmarshallerContext>, IUnmarshaller<InventoryEncryption, JsonUnmarshallerContext>
+    public class InventoryEncryptionUnmarshaller : IXmlUnmarshaller<InventoryEncryption, XmlUnmarshallerContext>, IXmlUnmarshaller<InventoryEncryption, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryFilterUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryFilterUnmarshaller.cs
index e71caada72bf..ebb6853d743a 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryFilterUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryFilterUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     ///   InventoryFilter Unmarshaller
     /// </summary>
-    public class InventoryFilterUnmarshaller : IUnmarshaller<InventoryFilter, XmlUnmarshallerContext>, IUnmarshaller<InventoryFilter, JsonUnmarshallerContext> 
+    public class InventoryFilterUnmarshaller : IXmlUnmarshaller<InventoryFilter, XmlUnmarshallerContext>, IXmlUnmarshaller<InventoryFilter, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryS3BucketDestinationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryS3BucketDestinationUnmarshaller.cs
index a9c9638d62aa..c46277bbec6e 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryS3BucketDestinationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryS3BucketDestinationUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     ///   InventoryS3BucketDestination Unmarshaller
     /// </summary>
-    public class InventoryS3BucketDestinationUnmarshaller : IUnmarshaller<InventoryS3BucketDestination, XmlUnmarshallerContext>, IUnmarshaller<InventoryS3BucketDestination, JsonUnmarshallerContext> 
+    public class InventoryS3BucketDestinationUnmarshaller : IXmlUnmarshaller<InventoryS3BucketDestination, XmlUnmarshallerContext>, IXmlUnmarshaller<InventoryS3BucketDestination, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryScheduleUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryScheduleUnmarshaller.cs
index 40d3c0fa158a..24c1ec623828 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryScheduleUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/InventoryScheduleUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     ///   InventorySchedule Unmarshaller
     /// </summary>
-    public class InventoryScheduleUnmarshaller : IUnmarshaller<InventorySchedule, XmlUnmarshallerContext>, IUnmarshaller<InventorySchedule, JsonUnmarshallerContext> 
+    public class InventoryScheduleUnmarshaller : IXmlUnmarshaller<InventorySchedule, XmlUnmarshallerContext>, IXmlUnmarshaller<InventorySchedule, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/LifecycleFilterPredicateListUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/LifecycleFilterPredicateListUnmarshaller.cs
index 6c2498a5f877..17ce00b66946 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/LifecycleFilterPredicateListUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/LifecycleFilterPredicateListUnmarshaller.cs
@@ -22,8 +22,8 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// LifecycleFilterPredicate Unmarshaller
     /// </summary>
-    public class LifecycleFilterPredicateListUnmarshaller : IUnmarshaller<List<LifecycleFilterPredicate>, XmlUnmarshallerContext>,
-        IUnmarshaller<List<LifecycleFilterPredicate>, JsonUnmarshallerContext>
+    public class LifecycleFilterPredicateListUnmarshaller : IXmlUnmarshaller<List<LifecycleFilterPredicate>, XmlUnmarshallerContext>,
+        IXmlUnmarshaller<List<LifecycleFilterPredicate>, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/LifecycleRuleNoncurrentVersionExpirationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/LifecycleRuleNoncurrentVersionExpirationUnmarshaller.cs
index e54cf86beb90..e3f3c6b012d1 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/LifecycleRuleNoncurrentVersionExpirationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/LifecycleRuleNoncurrentVersionExpirationUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     ///   LifecycleRuleNoncurrentVersionExpiration Unmarshaller
     /// </summary>
-    public class LifecycleRuleNoncurrentVersionExpirationUnmarshaller : IUnmarshaller<LifecycleRuleNoncurrentVersionExpiration, XmlUnmarshallerContext>, IUnmarshaller<LifecycleRuleNoncurrentVersionExpiration, JsonUnmarshallerContext>
+    public class LifecycleRuleNoncurrentVersionExpirationUnmarshaller : IXmlUnmarshaller<LifecycleRuleNoncurrentVersionExpiration, XmlUnmarshallerContext>, IXmlUnmarshaller<LifecycleRuleNoncurrentVersionExpiration, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/LifecycleRuleNoncurrentVersionTransitionUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/LifecycleRuleNoncurrentVersionTransitionUnmarshaller.cs
index ab58a1f44e22..44575e064ff5 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/LifecycleRuleNoncurrentVersionTransitionUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/LifecycleRuleNoncurrentVersionTransitionUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     ///   LifecycleRuleNoncurrentVersionTransition Unmarshaller
     /// </summary>
-    public class LifecycleRuleNoncurrentVersionTransitionUnmarshaller : IUnmarshaller<LifecycleRuleNoncurrentVersionTransition, XmlUnmarshallerContext>, IUnmarshaller<LifecycleRuleNoncurrentVersionTransition, JsonUnmarshallerContext>
+    public class LifecycleRuleNoncurrentVersionTransitionUnmarshaller : IXmlUnmarshaller<LifecycleRuleNoncurrentVersionTransition, XmlUnmarshallerContext>, IXmlUnmarshaller<LifecycleRuleNoncurrentVersionTransition, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListDirectoryBucketsResponseUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListDirectoryBucketsResponseUnmarshaller.cs
index 9468a018272e..4f643c00c11e 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListDirectoryBucketsResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListDirectoryBucketsResponseUnmarshaller.cs
@@ -88,7 +88,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, ListDirecto
         /// <returns></returns>
         public override AmazonServiceException UnmarshallException(XmlUnmarshallerContext context, Exception innerException, HttpStatusCode statusCode)
         {
-            ErrorResponse errorResponse = ErrorResponseUnmarshaller.GetInstance().Unmarshall(context);
+            ErrorResponse errorResponse = XmlErrorResponseUnmarshaller.GetInstance().Unmarshall(context);
             errorResponse.InnerException = innerException;
             errorResponse.StatusCode = statusCode;
 
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/LoggingEnabledUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/LoggingEnabledUnmarshaller.cs
index ecd06f437218..729d07c8317f 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/LoggingEnabledUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/LoggingEnabledUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   LoggingEnabled Unmarshaller
      /// </summary>
-    public class LoggingEnabledUnmarshaller : IUnmarshaller<S3BucketLoggingConfig, XmlUnmarshallerContext>, IUnmarshaller<S3BucketLoggingConfig, JsonUnmarshallerContext> 
+    public class LoggingEnabledUnmarshaller : IXmlUnmarshaller<S3BucketLoggingConfig, XmlUnmarshallerContext>, IXmlUnmarshaller<S3BucketLoggingConfig, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/MetricsConfigurationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/MetricsConfigurationUnmarshaller.cs
index db087ed99b59..ee3023b1170e 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/MetricsConfigurationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/MetricsConfigurationUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// MetricsConfiguration Unmarshaller 
     /// </summary>   
-    public class MetricsConfigurationUnmarshaller : IUnmarshaller<MetricsConfiguration, XmlUnmarshallerContext>, IUnmarshaller<MetricsConfiguration, JsonUnmarshallerContext> 
+    public class MetricsConfigurationUnmarshaller : IXmlUnmarshaller<MetricsConfiguration, XmlUnmarshallerContext>, IXmlUnmarshaller<MetricsConfiguration, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/MetricsPredicateListUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/MetricsPredicateListUnmarshaller.cs
index 211821862c7f..76efae93df62 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/MetricsPredicateListUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/MetricsPredicateListUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// MetricsFilte Unmarshaller 
     /// </summary>  
-    public class MetricsPredicateListFilterUnmarshaller : IUnmarshaller<List<MetricsFilterPredicate>, XmlUnmarshallerContext>, IUnmarshaller<List<MetricsFilterPredicate>, JsonUnmarshallerContext> 
+    public class MetricsPredicateListFilterUnmarshaller : IXmlUnmarshaller<List<MetricsFilterPredicate>, XmlUnmarshallerContext>, IXmlUnmarshaller<List<MetricsFilterPredicate>, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/MetricsUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/MetricsUnmarshaller.cs
index dfdfc14334c1..a66109d3870c 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/MetricsUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/MetricsUnmarshaller.cs
@@ -9,7 +9,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Metrics unmarshaller
     /// </summary>
-    public class MetricsUnmarshaller : IUnmarshaller<Metrics, XmlUnmarshallerContext>, IUnmarshaller<Metrics, JsonUnmarshallerContext>
+    public class MetricsUnmarshaller : IXmlUnmarshaller<Metrics, XmlUnmarshallerContext>, IXmlUnmarshaller<Metrics, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/MultipartUploadUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/MultipartUploadUnmarshaller.cs
index 181726b92173..a152d16ed2e2 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/MultipartUploadUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/MultipartUploadUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   UploadsItem Unmarshaller
      /// </summary>
-    public class MultipartUploadUnmarshaller : IUnmarshaller<MultipartUpload, XmlUnmarshallerContext>, IUnmarshaller<MultipartUpload, JsonUnmarshallerContext> 
+    public class MultipartUploadUnmarshaller : IXmlUnmarshaller<MultipartUpload, XmlUnmarshallerContext>, IXmlUnmarshaller<MultipartUpload, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/NoSuchAccesspointExceptionUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/NoSuchAccesspointExceptionUnmarshaller.cs
index 7c476082d012..53d1be3ae7ce 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/NoSuchAccesspointExceptionUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/NoSuchAccesspointExceptionUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for NoSuchAccesspointException operation
     /// </summary>  
-    public class NoSuchAccesspointExceptionUnmarshaller : IErrorResponseUnmarshaller<NoSuchAccesspointException, XmlUnmarshallerContext>
+    public class NoSuchAccesspointExceptionUnmarshaller : IXmlErrorResponseUnmarshaller<NoSuchAccesspointException, XmlUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/NoSuchBucketExceptionUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/NoSuchBucketExceptionUnmarshaller.cs
index eb2854d83dea..8fcc4f74ecd4 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/NoSuchBucketExceptionUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/NoSuchBucketExceptionUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for NoSuchBucketException operation
     /// </summary>  
-    public class NoSuchBucketExceptionUnmarshaller : IErrorResponseUnmarshaller<NoSuchBucketException, XmlUnmarshallerContext>
+    public class NoSuchBucketExceptionUnmarshaller : IXmlErrorResponseUnmarshaller<NoSuchBucketException, XmlUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ObjectLockConfigurationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ObjectLockConfigurationUnmarshaller.cs
index ce59812f9b3b..4a6204717d3e 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ObjectLockConfigurationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ObjectLockConfigurationUnmarshaller.cs
@@ -35,7 +35,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for ObjectLockConfiguration Object
     /// </summary>  
-    public class ObjectLockConfigurationUnmarshaller : IUnmarshaller<ObjectLockConfiguration, XmlUnmarshallerContext>, IUnmarshaller<ObjectLockConfiguration, JsonUnmarshallerContext>
+    public class ObjectLockConfigurationUnmarshaller : IXmlUnmarshaller<ObjectLockConfiguration, XmlUnmarshallerContext>, IXmlUnmarshaller<ObjectLockConfiguration, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ObjectLockLegalHoldUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ObjectLockLegalHoldUnmarshaller.cs
index 45c07ab1093a..d799e0089763 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ObjectLockLegalHoldUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ObjectLockLegalHoldUnmarshaller.cs
@@ -35,7 +35,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for ObjectLockLegalHold Object
     /// </summary>  
-    public class ObjectLockLegalHoldUnmarshaller : IUnmarshaller<ObjectLockLegalHold, XmlUnmarshallerContext>, IUnmarshaller<ObjectLockLegalHold, JsonUnmarshallerContext>
+    public class ObjectLockLegalHoldUnmarshaller : IXmlUnmarshaller<ObjectLockLegalHold, XmlUnmarshallerContext>, IXmlUnmarshaller<ObjectLockLegalHold, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ObjectLockRetentionUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ObjectLockRetentionUnmarshaller.cs
index 0dd10c644cab..5b91e4890dec 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ObjectLockRetentionUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ObjectLockRetentionUnmarshaller.cs
@@ -35,7 +35,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for ObjectLockRetention Object
     /// </summary>  
-    public class ObjectLockRetentionUnmarshaller : IUnmarshaller<ObjectLockRetention, XmlUnmarshallerContext>, IUnmarshaller<ObjectLockRetention, JsonUnmarshallerContext>
+    public class ObjectLockRetentionUnmarshaller : IXmlUnmarshaller<ObjectLockRetention, XmlUnmarshallerContext>, IXmlUnmarshaller<ObjectLockRetention, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ObjectLockRuleUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ObjectLockRuleUnmarshaller.cs
index a0b85b05812c..4053b224f854 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ObjectLockRuleUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ObjectLockRuleUnmarshaller.cs
@@ -35,7 +35,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for ObjectLockRule Object
     /// </summary>  
-    public class ObjectLockRuleUnmarshaller : IUnmarshaller<ObjectLockRule, XmlUnmarshallerContext>, IUnmarshaller<ObjectLockRule, JsonUnmarshallerContext>
+    public class ObjectLockRuleUnmarshaller : IXmlUnmarshaller<ObjectLockRule, XmlUnmarshallerContext>, IXmlUnmarshaller<ObjectLockRule, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ObjectPartUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ObjectPartUnmarshaller.cs
index 59a8ef9aaedb..a32320ec964f 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ObjectPartUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ObjectPartUnmarshaller.cs
@@ -32,7 +32,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for ObjectPart Object
     /// </summary>  
-    public class ObjectPartUnmarshaller : IUnmarshaller<ObjectPart, XmlUnmarshallerContext>
+    public class ObjectPartUnmarshaller : IXmlUnmarshaller<ObjectPart, XmlUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/OwnerUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/OwnerUnmarshaller.cs
index ec3a5e46e950..a13e6706d033 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/OwnerUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/OwnerUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   Owner Unmarshaller
      /// </summary>
-    public class OwnerUnmarshaller : IUnmarshaller<Owner, XmlUnmarshallerContext>, IUnmarshaller<Owner, JsonUnmarshallerContext> 
+    public class OwnerUnmarshaller : IXmlUnmarshaller<Owner, XmlUnmarshallerContext>, IXmlUnmarshaller<Owner, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/OwnershipControlsRuleUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/OwnershipControlsRuleUnmarshaller.cs
index 350fe38d481f..318e19e6e5be 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/OwnershipControlsRuleUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/OwnershipControlsRuleUnmarshaller.cs
@@ -25,7 +25,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// OwnershipControlsRule unmarshaller
     /// </summary>
-    public class OwnershipControlsRuleUnmarshaller : IUnmarshaller<OwnershipControlsRule, XmlUnmarshallerContext>, IUnmarshaller<OwnershipControlsRule, JsonUnmarshallerContext>
+    public class OwnershipControlsRuleUnmarshaller : IXmlUnmarshaller<OwnershipControlsRule, XmlUnmarshallerContext>, IXmlUnmarshaller<OwnershipControlsRule, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PartDetailUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PartDetailUnmarshaller.cs
index 27d644ace4dd..628469c2d86a 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PartDetailUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PartDetailUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   PartsItem Unmarshaller
      /// </summary>
-    public class PartDetailUnmarshaller : IUnmarshaller<PartDetail, XmlUnmarshallerContext>, IUnmarshaller<PartDetail, JsonUnmarshallerContext> 
+    public class PartDetailUnmarshaller : IXmlUnmarshaller<PartDetail, XmlUnmarshallerContext>, IXmlUnmarshaller<PartDetail, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PartitionedPrefixUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PartitionedPrefixUnmarshaller.cs
index d2e87fd529ad..f4f925e70937 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PartitionedPrefixUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PartitionedPrefixUnmarshaller.cs
@@ -19,7 +19,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for PartitionedPrefix Object
     /// </summary>  
-    public class PartitionedPrefixUnmarshaller : IUnmarshaller<PartitionedPrefix, XmlUnmarshallerContext>, IUnmarshaller<PartitionedPrefix, JsonUnmarshallerContext>
+    public class PartitionedPrefixUnmarshaller : IXmlUnmarshaller<PartitionedPrefix, XmlUnmarshallerContext>, IXmlUnmarshaller<PartitionedPrefix, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PolicyStatusUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PolicyStatusUnmarshaller.cs
index 1de7488e9fba..e43bb534a9bc 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PolicyStatusUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PolicyStatusUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      /// PolicyStatus Unmarshaller
      /// </summary>
-    public class PolicyStatusUnmarshaller : IUnmarshaller<PolicyStatus, XmlUnmarshallerContext>, IUnmarshaller<PolicyStatus, JsonUnmarshallerContext> 
+    public class PolicyStatusUnmarshaller : IXmlUnmarshaller<PolicyStatus, XmlUnmarshallerContext>, IXmlUnmarshaller<PolicyStatus, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PublicBlockConfigurationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PublicBlockConfigurationUnmarshaller.cs
index 0b40ca9a2e37..fa57643e7aa8 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PublicBlockConfigurationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PublicBlockConfigurationUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      /// PublicAccessBlockConfiguration Unmarshaller
      /// </summary>
-    public class PublicAccessBlockConfigurationUnmarshaller : IUnmarshaller<PublicAccessBlockConfiguration, XmlUnmarshallerContext>, IUnmarshaller<PublicAccessBlockConfiguration, JsonUnmarshallerContext> 
+    public class PublicAccessBlockConfigurationUnmarshaller : IXmlUnmarshaller<PublicAccessBlockConfiguration, XmlUnmarshallerContext>, IXmlUnmarshaller<PublicAccessBlockConfiguration, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutBucketResponseUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutBucketResponseUnmarshaller.cs
index 5e0c969b65b6..65a90943ddf3 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutBucketResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutBucketResponseUnmarshaller.cs
@@ -50,7 +50,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
         /// <returns></returns>
         public override AmazonServiceException UnmarshallException(XmlUnmarshallerContext context, Exception innerException, HttpStatusCode statusCode)
         {
-            ErrorResponse errorResponse = ErrorResponseUnmarshaller.GetInstance().Unmarshall(context);
+            ErrorResponse errorResponse = XmlErrorResponseUnmarshaller.GetInstance().Unmarshall(context);
             errorResponse.InnerException = innerException;
             errorResponse.StatusCode = statusCode;
 
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/QueueConfigurationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/QueueConfigurationUnmarshaller.cs
index 3a7a77411456..d0351036632d 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/QueueConfigurationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/QueueConfigurationUnmarshaller.cs
@@ -24,7 +24,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// QueueConfiguration unmarshaller
     /// </summary>
-    public class QueueConfigurationUnmarshaller : IUnmarshaller<QueueConfiguration, XmlUnmarshallerContext>, IUnmarshaller<QueueConfiguration, JsonUnmarshallerContext> 
+    public class QueueConfigurationUnmarshaller : IXmlUnmarshaller<QueueConfiguration, XmlUnmarshallerContext>, IXmlUnmarshaller<QueueConfiguration, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicaModificationsUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicaModificationsUnmarshaller.cs
index 589c4382979b..cc58c004e24a 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicaModificationsUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicaModificationsUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Unmarshaller for ReplicaModifications
     /// </summary>
-    public class ReplicaModificationsUnmarshaller : IUnmarshaller<ReplicaModifications, XmlUnmarshallerContext>, IUnmarshaller<ReplicaModifications, JsonUnmarshallerContext>
+    public class ReplicaModificationsUnmarshaller : IXmlUnmarshaller<ReplicaModifications, XmlUnmarshallerContext>, IXmlUnmarshaller<ReplicaModifications, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationDestinationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationDestinationUnmarshaller.cs
index c9670c472e50..84d211d5a802 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationDestinationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationDestinationUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// ReplicationDestination unmarshaller
     /// </summary>
-    public class ReplicationDestinationUnmarshaller : IUnmarshaller<ReplicationDestination, XmlUnmarshallerContext>, IUnmarshaller<ReplicationDestination, JsonUnmarshallerContext>
+    public class ReplicationDestinationUnmarshaller : IXmlUnmarshaller<ReplicationDestination, XmlUnmarshallerContext>, IXmlUnmarshaller<ReplicationDestination, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationRuleAndOperatorUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationRuleAndOperatorUnmarshaller.cs
index ad8df90d8d28..cdb18cc538aa 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationRuleAndOperatorUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationRuleAndOperatorUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// ReplicationRuleAndOperator unmarshaller
     /// </summary>
-    public class ReplicationRuleAndOperatorUnmarshaller : IUnmarshaller<ReplicationRuleAndOperator, XmlUnmarshallerContext>
+    public class ReplicationRuleAndOperatorUnmarshaller : IXmlUnmarshaller<ReplicationRuleAndOperator, XmlUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationRuleFilterUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationRuleFilterUnmarshaller.cs
index 780de7cc1127..e23001489b65 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationRuleFilterUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationRuleFilterUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// ReplicationRuleFilter unmarshaller
     /// </summary>
-    public class ReplicationRuleFilterUnmarshaller : IUnmarshaller<ReplicationRuleFilter, XmlUnmarshallerContext>
+    public class ReplicationRuleFilterUnmarshaller : IXmlUnmarshaller<ReplicationRuleFilter, XmlUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationRuleUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationRuleUnmarshaller.cs
index 3a2ef0f5458e..d3ecd82e4f90 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationRuleUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationRuleUnmarshaller.cs
@@ -23,7 +23,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// ReplicationRule unmarshaller
     /// </summary>
-    public class ReplicationRuleUnmarshaller : IUnmarshaller<ReplicationRule, XmlUnmarshallerContext>, IUnmarshaller<ReplicationRule, JsonUnmarshallerContext> 
+    public class ReplicationRuleUnmarshaller : IXmlUnmarshaller<ReplicationRule, XmlUnmarshallerContext>, IXmlUnmarshaller<ReplicationRule, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationTimeUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationTimeUnmarshaller.cs
index c4769fc83f73..0234aa902436 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationTimeUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationTimeUnmarshaller.cs
@@ -9,7 +9,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// ReplicationTime unmarshaller
     /// </summary>
-    public class ReplicationTimeUnmarshaller : IUnmarshaller<ReplicationTime, XmlUnmarshallerContext>, IUnmarshaller<ReplicationTime, JsonUnmarshallerContext>
+    public class ReplicationTimeUnmarshaller : IXmlUnmarshaller<ReplicationTime, XmlUnmarshallerContext>, IXmlUnmarshaller<ReplicationTime, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationTimeValueUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationTimeValueUnmarshaller.cs
index 29901c18eb5e..09a6e30e0724 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationTimeValueUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ReplicationTimeValueUnmarshaller.cs
@@ -9,7 +9,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// ReplicationTimeValue unmarshaller
     /// </summary>
-    public class ReplicationTimeValueUnmarshaller : IUnmarshaller<ReplicationTimeValue, XmlUnmarshallerContext>, IUnmarshaller<ReplicationTimeValue, JsonUnmarshallerContext>
+    public class ReplicationTimeValueUnmarshaller : IXmlUnmarshaller<ReplicationTimeValue, XmlUnmarshallerContext>, IXmlUnmarshaller<ReplicationTimeValue, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RestoreStatusUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RestoreStatusUnmarshaller.cs
index b658ed0f6a55..d2563edddf95 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RestoreStatusUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RestoreStatusUnmarshaller.cs
@@ -9,7 +9,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for RestoreStatus Object
     /// </summary>  
-    public class RestoreStatusUnmarshaller : IUnmarshaller<RestoreStatus, XmlUnmarshallerContext>
+    public class RestoreStatusUnmarshaller : IXmlUnmarshaller<RestoreStatus, XmlUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshall the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RoutingRuleConditionUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RoutingRuleConditionUnmarshaller.cs
index 52ba68dc831f..2024b694c373 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RoutingRuleConditionUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RoutingRuleConditionUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   Condition Unmarshaller
      /// </summary>
-    public class RoutingRuleConditionUnmarshaller : IUnmarshaller<RoutingRuleCondition, XmlUnmarshallerContext>, IUnmarshaller<RoutingRuleCondition, JsonUnmarshallerContext> 
+    public class RoutingRuleConditionUnmarshaller : IXmlUnmarshaller<RoutingRuleCondition, XmlUnmarshallerContext>, IXmlUnmarshaller<RoutingRuleCondition, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RoutingRuleRedirectUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RoutingRuleRedirectUnmarshaller.cs
index aa9bcb7501db..d23e733b4c8e 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RoutingRuleRedirectUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RoutingRuleRedirectUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   Redirect Unmarshaller
      /// </summary>
-    public class RoutingRuleRedirectUnmarshaller : IUnmarshaller<RoutingRuleRedirect, XmlUnmarshallerContext>, IUnmarshaller<RoutingRuleRedirect, JsonUnmarshallerContext> 
+    public class RoutingRuleRedirectUnmarshaller : IXmlUnmarshaller<RoutingRuleRedirect, XmlUnmarshallerContext>, IXmlUnmarshaller<RoutingRuleRedirect, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RoutingRuleUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RoutingRuleUnmarshaller.cs
index 371a1d2cde0d..8d3a4186522c 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RoutingRuleUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RoutingRuleUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   RoutingRule Unmarshaller
      /// </summary>
-    public class RoutingRuleUnmarshaller : IUnmarshaller<RoutingRule, XmlUnmarshallerContext>, IUnmarshaller<RoutingRule, JsonUnmarshallerContext> 
+    public class RoutingRuleUnmarshaller : IXmlUnmarshaller<RoutingRule, XmlUnmarshallerContext>, IXmlUnmarshaller<RoutingRule, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RulesItemUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RulesItemUnmarshaller.cs
index d2c2737b5914..3466974e616f 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RulesItemUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RulesItemUnmarshaller.cs
@@ -25,7 +25,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   RulesItem Unmarshaller
      /// </summary>
-    public class RulesItemUnmarshaller : IUnmarshaller<LifecycleRule, XmlUnmarshallerContext>, IUnmarshaller<LifecycleRule, JsonUnmarshallerContext> 
+    public class RulesItemUnmarshaller : IXmlUnmarshaller<LifecycleRule, XmlUnmarshallerContext>, IXmlUnmarshaller<LifecycleRule, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/S3ErrorResponseUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/S3ErrorResponseUnmarshaller.cs
index d1f7c70dcbe1..e544d9405868 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/S3ErrorResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/S3ErrorResponseUnmarshaller.cs
@@ -28,7 +28,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     ///    Response Unmarshaller for all Errors
     /// </summary>
-    public class S3ErrorResponseUnmarshaller : IUnmarshaller<S3ErrorResponse, XmlUnmarshallerContext>
+    public class S3ErrorResponseUnmarshaller : IXmlUnmarshaller<S3ErrorResponse, XmlUnmarshallerContext>
     {
         const string XML_CONTENT_TYPE = "text/xml";
 
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/S3KeyFilterUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/S3KeyFilterUnmarshaller.cs
index 53fe304a0db8..8e123e8c2fef 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/S3KeyFilterUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/S3KeyFilterUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     ///   S3KeyFilter Unmarshaller
     /// </summary>
-    public class S3KeyFilterUnmarshaller : IUnmarshaller<S3KeyFilter, XmlUnmarshallerContext>, IUnmarshaller<S3KeyFilter, JsonUnmarshallerContext> 
+    public class S3KeyFilterUnmarshaller : IXmlUnmarshaller<S3KeyFilter, XmlUnmarshallerContext>, IXmlUnmarshaller<S3KeyFilter, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SSEKMSUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SSEKMSUnmarshaller.cs
index 3ea749ca0db8..7d70df6db02c 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SSEKMSUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SSEKMSUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     ///   SSEKMS Unmarshaller
     /// </summary>
-    public class SSEKMSUnmarshaller : IUnmarshaller<SSEKMS, XmlUnmarshallerContext>, IUnmarshaller<SSEKMS, JsonUnmarshallerContext>
+    public class SSEKMSUnmarshaller : IXmlUnmarshaller<SSEKMS, XmlUnmarshallerContext>, IXmlUnmarshaller<SSEKMS, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SSES3Unmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SSES3Unmarshaller.cs
index a6a480995bfa..03f90edd38ba 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SSES3Unmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SSES3Unmarshaller.cs
@@ -20,7 +20,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// SSES3 Unmarshaller
     /// </summary>
-    public class SSES3Unmarshaller : IUnmarshaller<SSES3, XmlUnmarshallerContext>, IUnmarshaller<SSES3, JsonUnmarshallerContext>
+    public class SSES3Unmarshaller : IXmlUnmarshaller<SSES3, XmlUnmarshallerContext>, IXmlUnmarshaller<SSES3, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ServerSideEncryptionByDefaultUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ServerSideEncryptionByDefaultUnmarshaller.cs
index 199df5a01329..a5feeeda21a0 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ServerSideEncryptionByDefaultUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ServerSideEncryptionByDefaultUnmarshaller.cs
@@ -23,7 +23,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// ServerSideEncryptionByDefault unmarshaller
     /// </summary>
-    public class ServerSideEncryptionByDefaultUnmarshaller : IUnmarshaller<ServerSideEncryptionByDefault, XmlUnmarshallerContext>, IUnmarshaller<ServerSideEncryptionByDefault, JsonUnmarshallerContext>
+    public class ServerSideEncryptionByDefaultUnmarshaller : IXmlUnmarshaller<ServerSideEncryptionByDefault, XmlUnmarshallerContext>, IXmlUnmarshaller<ServerSideEncryptionByDefault, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ServerSideEncryptionRuleUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ServerSideEncryptionRuleUnmarshaller.cs
index d767c87f1fd6..8326f74b8df7 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ServerSideEncryptionRuleUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ServerSideEncryptionRuleUnmarshaller.cs
@@ -24,7 +24,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// ServerSideEncryptionRule unmarshaller
     /// </summary>
-    public class ServerSideEncryptionRuleUnmarshaller : IUnmarshaller<ServerSideEncryptionRule, XmlUnmarshallerContext>, IUnmarshaller<ServerSideEncryptionRule, JsonUnmarshallerContext>
+    public class ServerSideEncryptionRuleUnmarshaller : IXmlUnmarshaller<ServerSideEncryptionRule, XmlUnmarshallerContext>, IXmlUnmarshaller<ServerSideEncryptionRule, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SessionCredentialsUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SessionCredentialsUnmarshaller.cs
index 3a2ee3515c17..c4b6dd774343 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SessionCredentialsUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SessionCredentialsUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for SessionCredentials Object
     /// </summary>  
-    public class SessionCredentialsUnmarshaller : IUnmarshaller<SessionCredentials, XmlUnmarshallerContext>
+    public class SessionCredentialsUnmarshaller : IXmlUnmarshaller<SessionCredentials, XmlUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SimplePrefixUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SimplePrefixUnmarshaller.cs
index 882b3d525f21..3d4b269f696a 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SimplePrefixUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SimplePrefixUnmarshaller.cs
@@ -19,7 +19,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for SimplePrefix Object
     /// </summary>  
-    public class SimplePrefixUnmarshaller : IUnmarshaller<SimplePrefix, XmlUnmarshallerContext>, IUnmarshaller<SimplePrefix, JsonUnmarshallerContext>
+    public class SimplePrefixUnmarshaller : IXmlUnmarshaller<SimplePrefix, XmlUnmarshallerContext>, IXmlUnmarshaller<SimplePrefix, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SourceSelectionCriteriaUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SourceSelectionCriteriaUnmarshaller.cs
index 29fc8503cab1..b772932fcfe1 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SourceSelectionCriteriaUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SourceSelectionCriteriaUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// SourceSelectionCriteria unmarshaller
     /// </summary>
-    public class SourceSelectionCriteriaUnmarshaller : IUnmarshaller<SourceSelectionCriteria, XmlUnmarshallerContext>, IUnmarshaller<SourceSelectionCriteria, JsonUnmarshallerContext>
+    public class SourceSelectionCriteriaUnmarshaller : IXmlUnmarshaller<SourceSelectionCriteria, XmlUnmarshallerContext>, IXmlUnmarshaller<SourceSelectionCriteria, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SseKmsEncryptedObjectsUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SseKmsEncryptedObjectsUnmarshaller.cs
index b868722b5b7d..30201e98d236 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SseKmsEncryptedObjectsUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/SseKmsEncryptedObjectsUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// SseKmsEncryptedObjects unmarshaller
     /// </summary>
-    public class SseKmsEncryptedObjectsUnmarshaller : IUnmarshaller<SseKmsEncryptedObjects, XmlUnmarshallerContext>, IUnmarshaller<SseKmsEncryptedObjects, JsonUnmarshallerContext>
+    public class SseKmsEncryptedObjectsUnmarshaller : IXmlUnmarshaller<SseKmsEncryptedObjects, XmlUnmarshallerContext>, IXmlUnmarshaller<SseKmsEncryptedObjects, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/StorageClassAnalysisDataExportUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/StorageClassAnalysisDataExportUnmarshaller.cs
index 714c576a9376..86e5dc6380fc 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/StorageClassAnalysisDataExportUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/StorageClassAnalysisDataExportUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// StorageClassAnalysisDataExportDataExportUnmarshaller
     /// </summary>
-    public class StorageClassAnalysisDataExportUnmarshaller : IUnmarshaller<StorageClassAnalysisDataExport, XmlUnmarshallerContext>, IUnmarshaller<StorageClassAnalysisDataExport, JsonUnmarshallerContext>
+    public class StorageClassAnalysisDataExportUnmarshaller : IXmlUnmarshaller<StorageClassAnalysisDataExport, XmlUnmarshallerContext>, IXmlUnmarshaller<StorageClassAnalysisDataExport, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/StorageClassAnalysisUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/StorageClassAnalysisUnmarshaller.cs
index 6e9c960f9647..00ed705e2666 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/StorageClassAnalysisUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/StorageClassAnalysisUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     ///  StorageClassAnalysisUnmarshaller
     /// </summary>
-    public class StorageClassAnalysisUnmarshaller : IUnmarshaller<StorageClassAnalysis, XmlUnmarshallerContext>, IUnmarshaller<StorageClassAnalysis, JsonUnmarshallerContext>
+    public class StorageClassAnalysisUnmarshaller : IXmlUnmarshaller<StorageClassAnalysis, XmlUnmarshallerContext>, IXmlUnmarshaller<StorageClassAnalysis, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TagUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TagUnmarshaller.cs
index a5156ab67632..08827be36e1d 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TagUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TagUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   Tag Unmarshaller
      /// </summary>
-    public class TagUnmarshaller : IUnmarshaller<Tag, XmlUnmarshallerContext>, IUnmarshaller<Tag, JsonUnmarshallerContext> 
+    public class TagUnmarshaller : IXmlUnmarshaller<Tag, XmlUnmarshallerContext>, IXmlUnmarshaller<Tag, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TargetObjectKeyFormatUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TargetObjectKeyFormatUnmarshaller.cs
index 915f53c0eba4..72ae0f5f4ad9 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TargetObjectKeyFormatUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TargetObjectKeyFormatUnmarshaller.cs
@@ -19,7 +19,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for TargetObjectKeyFormat Object
     /// </summary>  
-    public class TargetObjectKeyFormatUnmarshaller : IUnmarshaller<TargetObjectKeyFormat, XmlUnmarshallerContext>, IUnmarshaller<TargetObjectKeyFormat, JsonUnmarshallerContext>
+    public class TargetObjectKeyFormatUnmarshaller : IXmlUnmarshaller<TargetObjectKeyFormat, XmlUnmarshallerContext>, IXmlUnmarshaller<TargetObjectKeyFormat, JsonUnmarshallerContext>
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TieringUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TieringUnmarshaller.cs
index f4463e300432..fd9313e48d9e 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TieringUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TieringUnmarshaller.cs
@@ -24,7 +24,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
 	/// <summary>
 	///   Tiering Unmarshaller
 	/// </summary>
-	public class TieringUnmarshaller : IUnmarshaller<Tiering, XmlUnmarshallerContext>, IUnmarshaller<Tiering, JsonUnmarshallerContext>
+	public class TieringUnmarshaller : IXmlUnmarshaller<Tiering, XmlUnmarshallerContext>, IXmlUnmarshaller<Tiering, JsonUnmarshallerContext>
 	{
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TopicConfigurationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TopicConfigurationUnmarshaller.cs
index 54fae6646be7..4ae52e4b955c 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TopicConfigurationUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TopicConfigurationUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   TopicConfiguration Unmarshaller
      /// </summary>
-    public class TopicConfigurationUnmarshaller : IUnmarshaller<TopicConfiguration, XmlUnmarshallerContext>, IUnmarshaller<TopicConfiguration, JsonUnmarshallerContext> 
+    public class TopicConfigurationUnmarshaller : IXmlUnmarshaller<TopicConfiguration, XmlUnmarshallerContext>, IXmlUnmarshaller<TopicConfiguration, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TransitionUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TransitionUnmarshaller.cs
index f73fa1888fc1..e2b20ee386f8 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TransitionUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TransitionUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   Transition Unmarshaller
      /// </summary>
-    public class TransitionUnmarshaller : IUnmarshaller<LifecycleTransition, XmlUnmarshallerContext>, IUnmarshaller<LifecycleTransition, JsonUnmarshallerContext> 
+    public class TransitionUnmarshaller : IXmlUnmarshaller<LifecycleTransition, XmlUnmarshallerContext>, IXmlUnmarshaller<LifecycleTransition, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/VersionsItemUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/VersionsItemUnmarshaller.cs
index 05e0a92bae7d..b2274347e2e1 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/VersionsItemUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/VersionsItemUnmarshaller.cs
@@ -22,7 +22,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
      /// <summary>
      ///   VersionsItem Unmarshaller
      /// </summary>
-    public class VersionsItemUnmarshaller : IUnmarshaller<S3ObjectVersion, XmlUnmarshallerContext>, IUnmarshaller<S3ObjectVersion, JsonUnmarshallerContext> 
+    public class VersionsItemUnmarshaller : IXmlUnmarshaller<S3ObjectVersion, XmlUnmarshallerContext>, IXmlUnmarshaller<S3ObjectVersion, JsonUnmarshallerContext> 
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.