diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsEndpointAuthSchemeGenerator.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsEndpointAuthSchemeGenerator.java
index 677f70bbff6..24118c57562 100644
--- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsEndpointAuthSchemeGenerator.java
+++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsEndpointAuthSchemeGenerator.java
@@ -25,6 +25,7 @@
 import software.amazon.smithy.go.codegen.SymbolUtils;
 import software.amazon.smithy.go.codegen.integration.GoIntegration;
 import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.shapes.OperationShape;
 import software.amazon.smithy.model.shapes.ServiceShape;
 
 
@@ -36,7 +37,9 @@
 public class AwsEndpointAuthSchemeGenerator implements GoIntegration {
 
     @Override
-    public void renderPostEndpointResolutionHook(GoSettings settings, GoWriter writer, Model model) {
+    public void renderPostEndpointResolutionHook(
+        GoSettings settings, GoWriter writer, Model model, Optional<OperationShape> operation
+    ) {
         ServiceShape serviceShape = settings.getService(model);
         writer.write(
             """
diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/EndpointDisableHttps.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/EndpointDisableHttps.java
index a6b10cd96b6..62d58837404 100644
--- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/EndpointDisableHttps.java
+++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/EndpointDisableHttps.java
@@ -47,7 +47,7 @@ public class EndpointDisableHttps implements GoIntegration {
 
         private final List<RuntimeClientPlugin> runtimeClientPlugins = new ArrayList<>();
 
-        public static final String MIDDLEWARE_ID = "EndpointDisableHTTPSMiddleware";
+        public static final String MIDDLEWARE_ID = "endpointDisableHTTPSMiddleware";
         public static final String MIDDLEWARE_ADDER = String.format("add%s", MIDDLEWARE_ID);
 
         /**
diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/LegacyEndpointContextSetter.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/LegacyEndpointContextSetter.java
index f4e32728f6a..a02776c55c6 100644
--- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/LegacyEndpointContextSetter.java
+++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/LegacyEndpointContextSetter.java
@@ -20,7 +20,7 @@ public class LegacyEndpointContextSetter implements GoIntegration {
     
     private final List<RuntimeClientPlugin> runtimeClientPlugins = new ArrayList<>();
 
-    public static final String MIDDLEWARE_ID = "LegacyEndpointContextSetter";
+    public static final String MIDDLEWARE_ID = "legacyEndpointContextSetter";
     public static final String MIDDLEWARE_ADDER = String.format("add%s", MIDDLEWARE_ID);
 
     /**
diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/DisableEndpointHostPrefix.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/DisableEndpointHostPrefix.java
index 8dc2a2139d4..ae2848d8a17 100644
--- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/DisableEndpointHostPrefix.java
+++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/DisableEndpointHostPrefix.java
@@ -1,21 +1,45 @@
 package software.amazon.smithy.aws.go.codegen.customization;
 
+import java.util.Optional;
+
+
 import software.amazon.smithy.go.codegen.GoSettings;
 import software.amazon.smithy.go.codegen.GoWriter;
 import software.amazon.smithy.go.codegen.SmithyGoDependency;
 import software.amazon.smithy.go.codegen.SymbolUtils;
 import software.amazon.smithy.go.codegen.integration.GoIntegration;
 import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.pattern.SmithyPattern.Segment;
+import software.amazon.smithy.model.traits.EndpointTrait;
+import software.amazon.smithy.model.shapes.OperationShape;
+
 
 public class DisableEndpointHostPrefix implements GoIntegration {
     @Override
-    public void renderPostEndpointResolutionHook(GoSettings settings, GoWriter writer, Model model) {
-        writer.write(
-            """
-            ctx = $T(ctx, true)
-            """,
-            SymbolUtils.createPointableSymbolBuilder("DisableEndpointHostPrefix", SmithyGoDependency.SMITHY_HTTP_TRANSPORT).build()
-        );
+    public void renderPostEndpointResolutionHook(
+        GoSettings settings, GoWriter writer, Model model, Optional<OperationShape> operation
+    ) {
+        if (!S3ModelUtils.isServiceS3Control(model, settings.getService(model))) {
+            return;
+        }
+
+        if (operation.isPresent() && operation.get().getTrait(EndpointTrait.class).isPresent()) {
+            EndpointTrait endpointTrait = operation.get().getTrait(EndpointTrait.class).get();
+            boolean written = false;
+            for (Segment segment : endpointTrait.getHostPrefix().getLabels()) {
+                if (segment.isLabel() && segment.getContent().equals("AccountId") && !written) {
+                    writer.write(
+                        """
+                        ctx = $T(ctx, true)
+                        """,
+                        SymbolUtils.createPointableSymbolBuilder(
+                            "DisableEndpointHostPrefix", SmithyGoDependency.SMITHY_HTTP_TRANSPORT).build()
+                    );
+                    // we only want the content above written ONCE per operation.
+                    written = true;
+                }
+            }
+        }
     }
     
 }
diff --git a/codegen/smithy-aws-go-codegen/src/main/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration b/codegen/smithy-aws-go-codegen/src/main/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration
index d442b4b0d90..5c807ef0b71 100644
--- a/codegen/smithy-aws-go-codegen/src/main/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration
+++ b/codegen/smithy-aws-go-codegen/src/main/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration
@@ -55,11 +55,11 @@ software.amazon.smithy.aws.go.codegen.AwsEndpointResolverInitializerGenerator
 software.amazon.smithy.aws.go.codegen.AwsEndpointResolverBuiltInGenerator
 software.amazon.smithy.aws.go.codegen.customization.S3HttpPathBucketFilterIntegration
 software.amazon.smithy.aws.go.codegen.customization.S3HttpLabelBucketFilterIntegration
-software.amazon.smithy.aws.go.codegen.customization.DisableEndpointHostPrefix
 software.amazon.smithy.aws.go.codegen.AwsEndpointAuthSchemeGenerator
 software.amazon.smithy.aws.go.codegen.EndpointDisableHttps
 software.amazon.smithy.aws.go.codegen.customization.S3Bucketer
 software.amazon.smithy.aws.go.codegen.customization.S3SerializeImmutableHostnameBucket
 software.amazon.smithy.aws.go.codegen.customization.S3UpdateOutpostArn
 software.amazon.smithy.aws.go.codegen.LegacyEndpointContextSetter
+software.amazon.smithy.aws.go.codegen.customization.DisableEndpointHostPrefix
 
diff --git a/service/eventbridge/api_client.go b/service/eventbridge/api_client.go
index d4d15393be6..16bf61d6115 100644
--- a/service/eventbridge/api_client.go
+++ b/service/eventbridge/api_client.go
@@ -234,15 +234,15 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf
 
 type noSmithyDocumentSerde = smithydocument.NoSerde
 
-type LegacyEndpointContextSetter struct {
+type legacyEndpointContextSetter struct {
 	LegacyResolver EndpointResolver
 }
 
-func (*LegacyEndpointContextSetter) ID() string {
-	return "LegacyEndpointContextSetter"
+func (*legacyEndpointContextSetter) ID() string {
+	return "legacyEndpointContextSetter"
 }
 
-func (m *LegacyEndpointContextSetter) HandleInitialize(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) (
+func (m *legacyEndpointContextSetter) HandleInitialize(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) (
 	out middleware.InitializeOutput, metadata middleware.Metadata, err error,
 ) {
 	if m.LegacyResolver != nil {
@@ -252,8 +252,8 @@ func (m *LegacyEndpointContextSetter) HandleInitialize(ctx context.Context, in m
 	return next.HandleInitialize(ctx, in)
 
 }
-func addLegacyEndpointContextSetter(stack *middleware.Stack, o Options) error {
-	return stack.Initialize.Add(&LegacyEndpointContextSetter{
+func addlegacyEndpointContextSetter(stack *middleware.Stack, o Options) error {
+	return stack.Initialize.Add(&legacyEndpointContextSetter{
 		LegacyResolver: o.EndpointResolver,
 	}, middleware.Before)
 }
@@ -534,15 +534,15 @@ func addRequestResponseLogging(stack *middleware.Stack, o Options) error {
 	}, middleware.After)
 }
 
-type EndpointDisableHTTPSMiddleware struct {
+type endpointDisableHTTPSMiddleware struct {
 	EndpointDisableHTTPS bool
 }
 
-func (*EndpointDisableHTTPSMiddleware) ID() string {
-	return "EndpointDisableHTTPSMiddleware"
+func (*endpointDisableHTTPSMiddleware) ID() string {
+	return "endpointDisableHTTPSMiddleware"
 }
 
-func (m *EndpointDisableHTTPSMiddleware) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
+func (m *endpointDisableHTTPSMiddleware) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
 	out middleware.SerializeOutput, metadata middleware.Metadata, err error,
 ) {
 	req, ok := in.Request.(*smithyhttp.Request)
@@ -557,8 +557,8 @@ func (m *EndpointDisableHTTPSMiddleware) HandleSerialize(ctx context.Context, in
 	return next.HandleSerialize(ctx, in)
 
 }
-func addEndpointDisableHTTPSMiddleware(stack *middleware.Stack, o Options) error {
-	return stack.Serialize.Insert(&EndpointDisableHTTPSMiddleware{
+func addendpointDisableHTTPSMiddleware(stack *middleware.Stack, o Options) error {
+	return stack.Serialize.Insert(&endpointDisableHTTPSMiddleware{
 		EndpointDisableHTTPS: o.EndpointOptions.DisableHTTPS,
 	}, "ResolveEndpointV2", middleware.After)
 }
diff --git a/service/eventbridge/api_op_ActivateEventSource.go b/service/eventbridge/api_op_ActivateEventSource.go
index 709bcd19952..16e9a0a97d5 100644
--- a/service/eventbridge/api_op_ActivateEventSource.go
+++ b/service/eventbridge/api_op_ActivateEventSource.go
@@ -59,7 +59,7 @@ func (c *Client) addOperationActivateEventSourceMiddlewares(stack *middleware.St
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -119,7 +119,7 @@ func (c *Client) addOperationActivateEventSourceMiddlewares(stack *middleware.St
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -178,8 +178,6 @@ func (m *opActivateEventSourceResolveEndpointMiddleware) HandleSerialize(ctx con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_CancelReplay.go b/service/eventbridge/api_op_CancelReplay.go
index 614cd9b9e41..d9259d270e5 100644
--- a/service/eventbridge/api_op_CancelReplay.go
+++ b/service/eventbridge/api_op_CancelReplay.go
@@ -69,7 +69,7 @@ func (c *Client) addOperationCancelReplayMiddlewares(stack *middleware.Stack, op
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -129,7 +129,7 @@ func (c *Client) addOperationCancelReplayMiddlewares(stack *middleware.Stack, op
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -188,8 +188,6 @@ func (m *opCancelReplayResolveEndpointMiddleware) HandleSerialize(ctx context.Co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_CreateApiDestination.go b/service/eventbridge/api_op_CreateApiDestination.go
index 01fbb5e9f45..73e48471bfb 100644
--- a/service/eventbridge/api_op_CreateApiDestination.go
+++ b/service/eventbridge/api_op_CreateApiDestination.go
@@ -97,7 +97,7 @@ func (c *Client) addOperationCreateApiDestinationMiddlewares(stack *middleware.S
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -157,7 +157,7 @@ func (c *Client) addOperationCreateApiDestinationMiddlewares(stack *middleware.S
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -216,8 +216,6 @@ func (m *opCreateApiDestinationResolveEndpointMiddleware) HandleSerialize(ctx co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_CreateArchive.go b/service/eventbridge/api_op_CreateArchive.go
index 2310e6294ae..7c6162922a3 100644
--- a/service/eventbridge/api_op_CreateArchive.go
+++ b/service/eventbridge/api_op_CreateArchive.go
@@ -92,7 +92,7 @@ func (c *Client) addOperationCreateArchiveMiddlewares(stack *middleware.Stack, o
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -152,7 +152,7 @@ func (c *Client) addOperationCreateArchiveMiddlewares(stack *middleware.Stack, o
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -211,8 +211,6 @@ func (m *opCreateArchiveResolveEndpointMiddleware) HandleSerialize(ctx context.C
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_CreateConnection.go b/service/eventbridge/api_op_CreateConnection.go
index 584c0bcb12c..3cccb282d0d 100644
--- a/service/eventbridge/api_op_CreateConnection.go
+++ b/service/eventbridge/api_op_CreateConnection.go
@@ -89,7 +89,7 @@ func (c *Client) addOperationCreateConnectionMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -149,7 +149,7 @@ func (c *Client) addOperationCreateConnectionMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -208,8 +208,6 @@ func (m *opCreateConnectionResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_CreateEndpoint.go b/service/eventbridge/api_op_CreateEndpoint.go
index 003bfb5ef2f..a01a63dc1cf 100644
--- a/service/eventbridge/api_op_CreateEndpoint.go
+++ b/service/eventbridge/api_op_CreateEndpoint.go
@@ -110,7 +110,7 @@ func (c *Client) addOperationCreateEndpointMiddlewares(stack *middleware.Stack,
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -170,7 +170,7 @@ func (c *Client) addOperationCreateEndpointMiddlewares(stack *middleware.Stack,
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -229,8 +229,6 @@ func (m *opCreateEndpointResolveEndpointMiddleware) HandleSerialize(ctx context.
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_CreateEventBus.go b/service/eventbridge/api_op_CreateEventBus.go
index 7cc83a9e1ce..c89806e11b2 100644
--- a/service/eventbridge/api_op_CreateEventBus.go
+++ b/service/eventbridge/api_op_CreateEventBus.go
@@ -77,7 +77,7 @@ func (c *Client) addOperationCreateEventBusMiddlewares(stack *middleware.Stack,
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -137,7 +137,7 @@ func (c *Client) addOperationCreateEventBusMiddlewares(stack *middleware.Stack,
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -196,8 +196,6 @@ func (m *opCreateEventBusResolveEndpointMiddleware) HandleSerialize(ctx context.
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_CreatePartnerEventSource.go b/service/eventbridge/api_op_CreatePartnerEventSource.go
index a825a24c3d2..f6fcd221469 100644
--- a/service/eventbridge/api_op_CreatePartnerEventSource.go
+++ b/service/eventbridge/api_op_CreatePartnerEventSource.go
@@ -88,7 +88,7 @@ func (c *Client) addOperationCreatePartnerEventSourceMiddlewares(stack *middlewa
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -148,7 +148,7 @@ func (c *Client) addOperationCreatePartnerEventSourceMiddlewares(stack *middlewa
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -207,8 +207,6 @@ func (m *opCreatePartnerEventSourceResolveEndpointMiddleware) HandleSerialize(ct
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_DeactivateEventSource.go b/service/eventbridge/api_op_DeactivateEventSource.go
index 1ab12ba7286..d803a0e1005 100644
--- a/service/eventbridge/api_op_DeactivateEventSource.go
+++ b/service/eventbridge/api_op_DeactivateEventSource.go
@@ -63,7 +63,7 @@ func (c *Client) addOperationDeactivateEventSourceMiddlewares(stack *middleware.
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -123,7 +123,7 @@ func (c *Client) addOperationDeactivateEventSourceMiddlewares(stack *middleware.
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -182,8 +182,6 @@ func (m *opDeactivateEventSourceResolveEndpointMiddleware) HandleSerialize(ctx c
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_DeauthorizeConnection.go b/service/eventbridge/api_op_DeauthorizeConnection.go
index 0124778c99c..779a2a0c238 100644
--- a/service/eventbridge/api_op_DeauthorizeConnection.go
+++ b/service/eventbridge/api_op_DeauthorizeConnection.go
@@ -78,7 +78,7 @@ func (c *Client) addOperationDeauthorizeConnectionMiddlewares(stack *middleware.
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -138,7 +138,7 @@ func (c *Client) addOperationDeauthorizeConnectionMiddlewares(stack *middleware.
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -197,8 +197,6 @@ func (m *opDeauthorizeConnectionResolveEndpointMiddleware) HandleSerialize(ctx c
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_DeleteApiDestination.go b/service/eventbridge/api_op_DeleteApiDestination.go
index 38d4e702cdd..69a26c2bdd5 100644
--- a/service/eventbridge/api_op_DeleteApiDestination.go
+++ b/service/eventbridge/api_op_DeleteApiDestination.go
@@ -58,7 +58,7 @@ func (c *Client) addOperationDeleteApiDestinationMiddlewares(stack *middleware.S
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -118,7 +118,7 @@ func (c *Client) addOperationDeleteApiDestinationMiddlewares(stack *middleware.S
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -177,8 +177,6 @@ func (m *opDeleteApiDestinationResolveEndpointMiddleware) HandleSerialize(ctx co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_DeleteArchive.go b/service/eventbridge/api_op_DeleteArchive.go
index c38812466d1..6728cb88e54 100644
--- a/service/eventbridge/api_op_DeleteArchive.go
+++ b/service/eventbridge/api_op_DeleteArchive.go
@@ -58,7 +58,7 @@ func (c *Client) addOperationDeleteArchiveMiddlewares(stack *middleware.Stack, o
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -118,7 +118,7 @@ func (c *Client) addOperationDeleteArchiveMiddlewares(stack *middleware.Stack, o
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -177,8 +177,6 @@ func (m *opDeleteArchiveResolveEndpointMiddleware) HandleSerialize(ctx context.C
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_DeleteConnection.go b/service/eventbridge/api_op_DeleteConnection.go
index 8a04deae67a..c007df28a5e 100644
--- a/service/eventbridge/api_op_DeleteConnection.go
+++ b/service/eventbridge/api_op_DeleteConnection.go
@@ -78,7 +78,7 @@ func (c *Client) addOperationDeleteConnectionMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -138,7 +138,7 @@ func (c *Client) addOperationDeleteConnectionMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -197,8 +197,6 @@ func (m *opDeleteConnectionResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_DeleteEndpoint.go b/service/eventbridge/api_op_DeleteEndpoint.go
index af40f9ac84a..b69594859f8 100644
--- a/service/eventbridge/api_op_DeleteEndpoint.go
+++ b/service/eventbridge/api_op_DeleteEndpoint.go
@@ -62,7 +62,7 @@ func (c *Client) addOperationDeleteEndpointMiddlewares(stack *middleware.Stack,
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -122,7 +122,7 @@ func (c *Client) addOperationDeleteEndpointMiddlewares(stack *middleware.Stack,
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -181,8 +181,6 @@ func (m *opDeleteEndpointResolveEndpointMiddleware) HandleSerialize(ctx context.
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_DeleteEventBus.go b/service/eventbridge/api_op_DeleteEventBus.go
index 1e442dcee8e..96cd94d92ab 100644
--- a/service/eventbridge/api_op_DeleteEventBus.go
+++ b/service/eventbridge/api_op_DeleteEventBus.go
@@ -60,7 +60,7 @@ func (c *Client) addOperationDeleteEventBusMiddlewares(stack *middleware.Stack,
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -120,7 +120,7 @@ func (c *Client) addOperationDeleteEventBusMiddlewares(stack *middleware.Stack,
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -179,8 +179,6 @@ func (m *opDeleteEventBusResolveEndpointMiddleware) HandleSerialize(ctx context.
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_DeletePartnerEventSource.go b/service/eventbridge/api_op_DeletePartnerEventSource.go
index 8fbb2dbb75c..07c14233239 100644
--- a/service/eventbridge/api_op_DeletePartnerEventSource.go
+++ b/service/eventbridge/api_op_DeletePartnerEventSource.go
@@ -67,7 +67,7 @@ func (c *Client) addOperationDeletePartnerEventSourceMiddlewares(stack *middlewa
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -127,7 +127,7 @@ func (c *Client) addOperationDeletePartnerEventSourceMiddlewares(stack *middlewa
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -186,8 +186,6 @@ func (m *opDeletePartnerEventSourceResolveEndpointMiddleware) HandleSerialize(ct
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_DeleteRule.go b/service/eventbridge/api_op_DeleteRule.go
index 54f31f0f16b..91653e3a9d8 100644
--- a/service/eventbridge/api_op_DeleteRule.go
+++ b/service/eventbridge/api_op_DeleteRule.go
@@ -79,7 +79,7 @@ func (c *Client) addOperationDeleteRuleMiddlewares(stack *middleware.Stack, opti
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -139,7 +139,7 @@ func (c *Client) addOperationDeleteRuleMiddlewares(stack *middleware.Stack, opti
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -198,8 +198,6 @@ func (m *opDeleteRuleResolveEndpointMiddleware) HandleSerialize(ctx context.Cont
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_DescribeApiDestination.go b/service/eventbridge/api_op_DescribeApiDestination.go
index 515bf65c2f5..4515a61929b 100644
--- a/service/eventbridge/api_op_DescribeApiDestination.go
+++ b/service/eventbridge/api_op_DescribeApiDestination.go
@@ -97,7 +97,7 @@ func (c *Client) addOperationDescribeApiDestinationMiddlewares(stack *middleware
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -157,7 +157,7 @@ func (c *Client) addOperationDescribeApiDestinationMiddlewares(stack *middleware
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -216,8 +216,6 @@ func (m *opDescribeApiDestinationResolveEndpointMiddleware) HandleSerialize(ctx
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_DescribeArchive.go b/service/eventbridge/api_op_DescribeArchive.go
index 3faba4d1214..06bcd0bdd80 100644
--- a/service/eventbridge/api_op_DescribeArchive.go
+++ b/service/eventbridge/api_op_DescribeArchive.go
@@ -94,7 +94,7 @@ func (c *Client) addOperationDescribeArchiveMiddlewares(stack *middleware.Stack,
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -154,7 +154,7 @@ func (c *Client) addOperationDescribeArchiveMiddlewares(stack *middleware.Stack,
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -213,8 +213,6 @@ func (m *opDescribeArchiveResolveEndpointMiddleware) HandleSerialize(ctx context
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_DescribeConnection.go b/service/eventbridge/api_op_DescribeConnection.go
index c41c38544b3..80255f63025 100644
--- a/service/eventbridge/api_op_DescribeConnection.go
+++ b/service/eventbridge/api_op_DescribeConnection.go
@@ -95,7 +95,7 @@ func (c *Client) addOperationDescribeConnectionMiddlewares(stack *middleware.Sta
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -155,7 +155,7 @@ func (c *Client) addOperationDescribeConnectionMiddlewares(stack *middleware.Sta
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -214,8 +214,6 @@ func (m *opDescribeConnectionResolveEndpointMiddleware) HandleSerialize(ctx cont
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_DescribeEndpoint.go b/service/eventbridge/api_op_DescribeEndpoint.go
index 021f71a2dab..35a593cf229 100644
--- a/service/eventbridge/api_op_DescribeEndpoint.go
+++ b/service/eventbridge/api_op_DescribeEndpoint.go
@@ -109,7 +109,7 @@ func (c *Client) addOperationDescribeEndpointMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -169,7 +169,7 @@ func (c *Client) addOperationDescribeEndpointMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -228,8 +228,6 @@ func (m *opDescribeEndpointResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_DescribeEventBus.go b/service/eventbridge/api_op_DescribeEventBus.go
index 347fa883dfa..40c9b907fd3 100644
--- a/service/eventbridge/api_op_DescribeEventBus.go
+++ b/service/eventbridge/api_op_DescribeEventBus.go
@@ -75,7 +75,7 @@ func (c *Client) addOperationDescribeEventBusMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -132,7 +132,7 @@ func (c *Client) addOperationDescribeEventBusMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -191,8 +191,6 @@ func (m *opDescribeEventBusResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_DescribeEventSource.go b/service/eventbridge/api_op_DescribeEventSource.go
index 6ce8a0cb18f..deea4fa39d5 100644
--- a/service/eventbridge/api_op_DescribeEventSource.go
+++ b/service/eventbridge/api_op_DescribeEventSource.go
@@ -85,7 +85,7 @@ func (c *Client) addOperationDescribeEventSourceMiddlewares(stack *middleware.St
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -145,7 +145,7 @@ func (c *Client) addOperationDescribeEventSourceMiddlewares(stack *middleware.St
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -204,8 +204,6 @@ func (m *opDescribeEventSourceResolveEndpointMiddleware) HandleSerialize(ctx con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_DescribePartnerEventSource.go b/service/eventbridge/api_op_DescribePartnerEventSource.go
index 8f3b8ffa24d..dcb38d52f2b 100644
--- a/service/eventbridge/api_op_DescribePartnerEventSource.go
+++ b/service/eventbridge/api_op_DescribePartnerEventSource.go
@@ -68,7 +68,7 @@ func (c *Client) addOperationDescribePartnerEventSourceMiddlewares(stack *middle
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -128,7 +128,7 @@ func (c *Client) addOperationDescribePartnerEventSourceMiddlewares(stack *middle
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -187,8 +187,6 @@ func (m *opDescribePartnerEventSourceResolveEndpointMiddleware) HandleSerialize(
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_DescribeReplay.go b/service/eventbridge/api_op_DescribeReplay.go
index 27559565b77..3eb9cf4631b 100644
--- a/service/eventbridge/api_op_DescribeReplay.go
+++ b/service/eventbridge/api_op_DescribeReplay.go
@@ -105,7 +105,7 @@ func (c *Client) addOperationDescribeReplayMiddlewares(stack *middleware.Stack,
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -165,7 +165,7 @@ func (c *Client) addOperationDescribeReplayMiddlewares(stack *middleware.Stack,
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -224,8 +224,6 @@ func (m *opDescribeReplayResolveEndpointMiddleware) HandleSerialize(ctx context.
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_DescribeRule.go b/service/eventbridge/api_op_DescribeRule.go
index 7e4e2bd70d3..053978e8aa0 100644
--- a/service/eventbridge/api_op_DescribeRule.go
+++ b/service/eventbridge/api_op_DescribeRule.go
@@ -103,7 +103,7 @@ func (c *Client) addOperationDescribeRuleMiddlewares(stack *middleware.Stack, op
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -163,7 +163,7 @@ func (c *Client) addOperationDescribeRuleMiddlewares(stack *middleware.Stack, op
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -222,8 +222,6 @@ func (m *opDescribeRuleResolveEndpointMiddleware) HandleSerialize(ctx context.Co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_DisableRule.go b/service/eventbridge/api_op_DisableRule.go
index 5ffa7f89fae..bbc651abfd8 100644
--- a/service/eventbridge/api_op_DisableRule.go
+++ b/service/eventbridge/api_op_DisableRule.go
@@ -65,7 +65,7 @@ func (c *Client) addOperationDisableRuleMiddlewares(stack *middleware.Stack, opt
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -125,7 +125,7 @@ func (c *Client) addOperationDisableRuleMiddlewares(stack *middleware.Stack, opt
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -184,8 +184,6 @@ func (m *opDisableRuleResolveEndpointMiddleware) HandleSerialize(ctx context.Con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_EnableRule.go b/service/eventbridge/api_op_EnableRule.go
index ced085b5fb7..d90e1f0e76f 100644
--- a/service/eventbridge/api_op_EnableRule.go
+++ b/service/eventbridge/api_op_EnableRule.go
@@ -64,7 +64,7 @@ func (c *Client) addOperationEnableRuleMiddlewares(stack *middleware.Stack, opti
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -124,7 +124,7 @@ func (c *Client) addOperationEnableRuleMiddlewares(stack *middleware.Stack, opti
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -183,8 +183,6 @@ func (m *opEnableRuleResolveEndpointMiddleware) HandleSerialize(ctx context.Cont
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_ListApiDestinations.go b/service/eventbridge/api_op_ListApiDestinations.go
index c7e6bbf51c0..0e54cbb9895 100644
--- a/service/eventbridge/api_op_ListApiDestinations.go
+++ b/service/eventbridge/api_op_ListApiDestinations.go
@@ -75,7 +75,7 @@ func (c *Client) addOperationListApiDestinationsMiddlewares(stack *middleware.St
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -132,7 +132,7 @@ func (c *Client) addOperationListApiDestinationsMiddlewares(stack *middleware.St
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -191,8 +191,6 @@ func (m *opListApiDestinationsResolveEndpointMiddleware) HandleSerialize(ctx con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_ListArchives.go b/service/eventbridge/api_op_ListArchives.go
index 734f3356fdf..dcfabe2edd6 100644
--- a/service/eventbridge/api_op_ListArchives.go
+++ b/service/eventbridge/api_op_ListArchives.go
@@ -78,7 +78,7 @@ func (c *Client) addOperationListArchivesMiddlewares(stack *middleware.Stack, op
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -135,7 +135,7 @@ func (c *Client) addOperationListArchivesMiddlewares(stack *middleware.Stack, op
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -194,8 +194,6 @@ func (m *opListArchivesResolveEndpointMiddleware) HandleSerialize(ctx context.Co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_ListConnections.go b/service/eventbridge/api_op_ListConnections.go
index 508f34d7797..3cff0ab733c 100644
--- a/service/eventbridge/api_op_ListConnections.go
+++ b/service/eventbridge/api_op_ListConnections.go
@@ -74,7 +74,7 @@ func (c *Client) addOperationListConnectionsMiddlewares(stack *middleware.Stack,
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -131,7 +131,7 @@ func (c *Client) addOperationListConnectionsMiddlewares(stack *middleware.Stack,
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -190,8 +190,6 @@ func (m *opListConnectionsResolveEndpointMiddleware) HandleSerialize(ctx context
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_ListEndpoints.go b/service/eventbridge/api_op_ListEndpoints.go
index 6e2b087992e..9b41dd2bea1 100644
--- a/service/eventbridge/api_op_ListEndpoints.go
+++ b/service/eventbridge/api_op_ListEndpoints.go
@@ -87,7 +87,7 @@ func (c *Client) addOperationListEndpointsMiddlewares(stack *middleware.Stack, o
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -144,7 +144,7 @@ func (c *Client) addOperationListEndpointsMiddlewares(stack *middleware.Stack, o
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -203,8 +203,6 @@ func (m *opListEndpointsResolveEndpointMiddleware) HandleSerialize(ctx context.C
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_ListEventBuses.go b/service/eventbridge/api_op_ListEventBuses.go
index 64670d54d0d..e54b26f8d07 100644
--- a/service/eventbridge/api_op_ListEventBuses.go
+++ b/service/eventbridge/api_op_ListEventBuses.go
@@ -75,7 +75,7 @@ func (c *Client) addOperationListEventBusesMiddlewares(stack *middleware.Stack,
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -132,7 +132,7 @@ func (c *Client) addOperationListEventBusesMiddlewares(stack *middleware.Stack,
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -191,8 +191,6 @@ func (m *opListEventBusesResolveEndpointMiddleware) HandleSerialize(ctx context.
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_ListEventSources.go b/service/eventbridge/api_op_ListEventSources.go
index cbbc6d8ef29..924eed37bfe 100644
--- a/service/eventbridge/api_op_ListEventSources.go
+++ b/service/eventbridge/api_op_ListEventSources.go
@@ -77,7 +77,7 @@ func (c *Client) addOperationListEventSourcesMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -134,7 +134,7 @@ func (c *Client) addOperationListEventSourcesMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -193,8 +193,6 @@ func (m *opListEventSourcesResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_ListPartnerEventSourceAccounts.go b/service/eventbridge/api_op_ListPartnerEventSourceAccounts.go
index 4895e1954b0..d39edf4292e 100644
--- a/service/eventbridge/api_op_ListPartnerEventSourceAccounts.go
+++ b/service/eventbridge/api_op_ListPartnerEventSourceAccounts.go
@@ -78,7 +78,7 @@ func (c *Client) addOperationListPartnerEventSourceAccountsMiddlewares(stack *mi
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -138,7 +138,7 @@ func (c *Client) addOperationListPartnerEventSourceAccountsMiddlewares(stack *mi
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -197,8 +197,6 @@ func (m *opListPartnerEventSourceAccountsResolveEndpointMiddleware) HandleSerial
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_ListPartnerEventSources.go b/service/eventbridge/api_op_ListPartnerEventSources.go
index aa7cf2faa37..9ebb189cf01 100644
--- a/service/eventbridge/api_op_ListPartnerEventSources.go
+++ b/service/eventbridge/api_op_ListPartnerEventSources.go
@@ -79,7 +79,7 @@ func (c *Client) addOperationListPartnerEventSourcesMiddlewares(stack *middlewar
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -139,7 +139,7 @@ func (c *Client) addOperationListPartnerEventSourcesMiddlewares(stack *middlewar
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -198,8 +198,6 @@ func (m *opListPartnerEventSourcesResolveEndpointMiddleware) HandleSerialize(ctx
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_ListReplays.go b/service/eventbridge/api_op_ListReplays.go
index 9f6efa4d63d..1fcfd7a57f3 100644
--- a/service/eventbridge/api_op_ListReplays.go
+++ b/service/eventbridge/api_op_ListReplays.go
@@ -78,7 +78,7 @@ func (c *Client) addOperationListReplaysMiddlewares(stack *middleware.Stack, opt
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -135,7 +135,7 @@ func (c *Client) addOperationListReplaysMiddlewares(stack *middleware.Stack, opt
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -194,8 +194,6 @@ func (m *opListReplaysResolveEndpointMiddleware) HandleSerialize(ctx context.Con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_ListRuleNamesByTarget.go b/service/eventbridge/api_op_ListRuleNamesByTarget.go
index 4aad4429879..1bebc74b616 100644
--- a/service/eventbridge/api_op_ListRuleNamesByTarget.go
+++ b/service/eventbridge/api_op_ListRuleNamesByTarget.go
@@ -77,7 +77,7 @@ func (c *Client) addOperationListRuleNamesByTargetMiddlewares(stack *middleware.
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -137,7 +137,7 @@ func (c *Client) addOperationListRuleNamesByTargetMiddlewares(stack *middleware.
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -196,8 +196,6 @@ func (m *opListRuleNamesByTargetResolveEndpointMiddleware) HandleSerialize(ctx c
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_ListRules.go b/service/eventbridge/api_op_ListRules.go
index 0beccd39abc..af807ce7efc 100644
--- a/service/eventbridge/api_op_ListRules.go
+++ b/service/eventbridge/api_op_ListRules.go
@@ -79,7 +79,7 @@ func (c *Client) addOperationListRulesMiddlewares(stack *middleware.Stack, optio
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -136,7 +136,7 @@ func (c *Client) addOperationListRulesMiddlewares(stack *middleware.Stack, optio
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -195,8 +195,6 @@ func (m *opListRulesResolveEndpointMiddleware) HandleSerialize(ctx context.Conte
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_ListTagsForResource.go b/service/eventbridge/api_op_ListTagsForResource.go
index 2411143fa15..fb942d4bd54 100644
--- a/service/eventbridge/api_op_ListTagsForResource.go
+++ b/service/eventbridge/api_op_ListTagsForResource.go
@@ -64,7 +64,7 @@ func (c *Client) addOperationListTagsForResourceMiddlewares(stack *middleware.St
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -124,7 +124,7 @@ func (c *Client) addOperationListTagsForResourceMiddlewares(stack *middleware.St
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -183,8 +183,6 @@ func (m *opListTagsForResourceResolveEndpointMiddleware) HandleSerialize(ctx con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_ListTargetsByRule.go b/service/eventbridge/api_op_ListTargetsByRule.go
index 2aaa1ce6811..183cdceb31d 100644
--- a/service/eventbridge/api_op_ListTargetsByRule.go
+++ b/service/eventbridge/api_op_ListTargetsByRule.go
@@ -77,7 +77,7 @@ func (c *Client) addOperationListTargetsByRuleMiddlewares(stack *middleware.Stac
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -137,7 +137,7 @@ func (c *Client) addOperationListTargetsByRuleMiddlewares(stack *middleware.Stac
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -196,8 +196,6 @@ func (m *opListTargetsByRuleResolveEndpointMiddleware) HandleSerialize(ctx conte
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_PutEvents.go b/service/eventbridge/api_op_PutEvents.go
index d6e0fa6fe98..f2e6b0152ed 100644
--- a/service/eventbridge/api_op_PutEvents.go
+++ b/service/eventbridge/api_op_PutEvents.go
@@ -78,7 +78,7 @@ func (c *Client) addOperationPutEventsMiddlewares(stack *middleware.Stack, optio
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -144,7 +144,7 @@ func (c *Client) addOperationPutEventsMiddlewares(stack *middleware.Stack, optio
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -228,8 +228,6 @@ func (m *opPutEventsResolveEndpointMiddleware) HandleSerialize(ctx context.Conte
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_PutPartnerEvents.go b/service/eventbridge/api_op_PutPartnerEvents.go
index 274a5017c11..374a60f0778 100644
--- a/service/eventbridge/api_op_PutPartnerEvents.go
+++ b/service/eventbridge/api_op_PutPartnerEvents.go
@@ -69,7 +69,7 @@ func (c *Client) addOperationPutPartnerEventsMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -129,7 +129,7 @@ func (c *Client) addOperationPutPartnerEventsMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -188,8 +188,6 @@ func (m *opPutPartnerEventsResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_PutPermission.go b/service/eventbridge/api_op_PutPermission.go
index 5ad1a749944..64900a11159 100644
--- a/service/eventbridge/api_op_PutPermission.go
+++ b/service/eventbridge/api_op_PutPermission.go
@@ -107,7 +107,7 @@ func (c *Client) addOperationPutPermissionMiddlewares(stack *middleware.Stack, o
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -167,7 +167,7 @@ func (c *Client) addOperationPutPermissionMiddlewares(stack *middleware.Stack, o
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -226,8 +226,6 @@ func (m *opPutPermissionResolveEndpointMiddleware) HandleSerialize(ctx context.C
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_PutRule.go b/service/eventbridge/api_op_PutRule.go
index 5a491d5af19..30ebbea3e4f 100644
--- a/service/eventbridge/api_op_PutRule.go
+++ b/service/eventbridge/api_op_PutRule.go
@@ -133,7 +133,7 @@ func (c *Client) addOperationPutRuleMiddlewares(stack *middleware.Stack, options
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -193,7 +193,7 @@ func (c *Client) addOperationPutRuleMiddlewares(stack *middleware.Stack, options
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -252,8 +252,6 @@ func (m *opPutRuleResolveEndpointMiddleware) HandleSerialize(ctx context.Context
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_PutTargets.go b/service/eventbridge/api_op_PutTargets.go
index 952ff72eca1..f8e18cbeb97 100644
--- a/service/eventbridge/api_op_PutTargets.go
+++ b/service/eventbridge/api_op_PutTargets.go
@@ -163,7 +163,7 @@ func (c *Client) addOperationPutTargetsMiddlewares(stack *middleware.Stack, opti
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -223,7 +223,7 @@ func (c *Client) addOperationPutTargetsMiddlewares(stack *middleware.Stack, opti
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -282,8 +282,6 @@ func (m *opPutTargetsResolveEndpointMiddleware) HandleSerialize(ctx context.Cont
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_RemovePermission.go b/service/eventbridge/api_op_RemovePermission.go
index b6f667d4a17..502ce32a519 100644
--- a/service/eventbridge/api_op_RemovePermission.go
+++ b/service/eventbridge/api_op_RemovePermission.go
@@ -69,7 +69,7 @@ func (c *Client) addOperationRemovePermissionMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -126,7 +126,7 @@ func (c *Client) addOperationRemovePermissionMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -185,8 +185,6 @@ func (m *opRemovePermissionResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_RemoveTargets.go b/service/eventbridge/api_op_RemoveTargets.go
index 8b27950bb29..b3454e7d8fd 100644
--- a/service/eventbridge/api_op_RemoveTargets.go
+++ b/service/eventbridge/api_op_RemoveTargets.go
@@ -90,7 +90,7 @@ func (c *Client) addOperationRemoveTargetsMiddlewares(stack *middleware.Stack, o
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -150,7 +150,7 @@ func (c *Client) addOperationRemoveTargetsMiddlewares(stack *middleware.Stack, o
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -209,8 +209,6 @@ func (m *opRemoveTargetsResolveEndpointMiddleware) HandleSerialize(ctx context.C
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_StartReplay.go b/service/eventbridge/api_op_StartReplay.go
index 2165ad3d79f..a468e6a99b8 100644
--- a/service/eventbridge/api_op_StartReplay.go
+++ b/service/eventbridge/api_op_StartReplay.go
@@ -107,7 +107,7 @@ func (c *Client) addOperationStartReplayMiddlewares(stack *middleware.Stack, opt
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -167,7 +167,7 @@ func (c *Client) addOperationStartReplayMiddlewares(stack *middleware.Stack, opt
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -226,8 +226,6 @@ func (m *opStartReplayResolveEndpointMiddleware) HandleSerialize(ctx context.Con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_TagResource.go b/service/eventbridge/api_op_TagResource.go
index d3b3c956723..3051f9ea6c9 100644
--- a/service/eventbridge/api_op_TagResource.go
+++ b/service/eventbridge/api_op_TagResource.go
@@ -74,7 +74,7 @@ func (c *Client) addOperationTagResourceMiddlewares(stack *middleware.Stack, opt
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -134,7 +134,7 @@ func (c *Client) addOperationTagResourceMiddlewares(stack *middleware.Stack, opt
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -193,8 +193,6 @@ func (m *opTagResourceResolveEndpointMiddleware) HandleSerialize(ctx context.Con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_TestEventPattern.go b/service/eventbridge/api_op_TestEventPattern.go
index 87b9b916a34..1f46998c82f 100644
--- a/service/eventbridge/api_op_TestEventPattern.go
+++ b/service/eventbridge/api_op_TestEventPattern.go
@@ -81,7 +81,7 @@ func (c *Client) addOperationTestEventPatternMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -141,7 +141,7 @@ func (c *Client) addOperationTestEventPatternMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -200,8 +200,6 @@ func (m *opTestEventPatternResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_UntagResource.go b/service/eventbridge/api_op_UntagResource.go
index 1d3057675e9..749a30396a4 100644
--- a/service/eventbridge/api_op_UntagResource.go
+++ b/service/eventbridge/api_op_UntagResource.go
@@ -64,7 +64,7 @@ func (c *Client) addOperationUntagResourceMiddlewares(stack *middleware.Stack, o
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -124,7 +124,7 @@ func (c *Client) addOperationUntagResourceMiddlewares(stack *middleware.Stack, o
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -183,8 +183,6 @@ func (m *opUntagResourceResolveEndpointMiddleware) HandleSerialize(ctx context.C
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_UpdateApiDestination.go b/service/eventbridge/api_op_UpdateApiDestination.go
index 76d8939f4d5..c89b7f12aaa 100644
--- a/service/eventbridge/api_op_UpdateApiDestination.go
+++ b/service/eventbridge/api_op_UpdateApiDestination.go
@@ -88,7 +88,7 @@ func (c *Client) addOperationUpdateApiDestinationMiddlewares(stack *middleware.S
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -148,7 +148,7 @@ func (c *Client) addOperationUpdateApiDestinationMiddlewares(stack *middleware.S
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -207,8 +207,6 @@ func (m *opUpdateApiDestinationResolveEndpointMiddleware) HandleSerialize(ctx co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_UpdateArchive.go b/service/eventbridge/api_op_UpdateArchive.go
index f6452b4d8dd..f5e7e1574b7 100644
--- a/service/eventbridge/api_op_UpdateArchive.go
+++ b/service/eventbridge/api_op_UpdateArchive.go
@@ -82,7 +82,7 @@ func (c *Client) addOperationUpdateArchiveMiddlewares(stack *middleware.Stack, o
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -142,7 +142,7 @@ func (c *Client) addOperationUpdateArchiveMiddlewares(stack *middleware.Stack, o
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -201,8 +201,6 @@ func (m *opUpdateArchiveResolveEndpointMiddleware) HandleSerialize(ctx context.C
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_UpdateConnection.go b/service/eventbridge/api_op_UpdateConnection.go
index 4f99412a1ac..b279d5e1a5a 100644
--- a/service/eventbridge/api_op_UpdateConnection.go
+++ b/service/eventbridge/api_op_UpdateConnection.go
@@ -85,7 +85,7 @@ func (c *Client) addOperationUpdateConnectionMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -145,7 +145,7 @@ func (c *Client) addOperationUpdateConnectionMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -204,8 +204,6 @@ func (m *opUpdateConnectionResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/api_op_UpdateEndpoint.go b/service/eventbridge/api_op_UpdateEndpoint.go
index 3900937e7ce..186fc888354 100644
--- a/service/eventbridge/api_op_UpdateEndpoint.go
+++ b/service/eventbridge/api_op_UpdateEndpoint.go
@@ -108,7 +108,7 @@ func (c *Client) addOperationUpdateEndpointMiddlewares(stack *middleware.Stack,
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -168,7 +168,7 @@ func (c *Client) addOperationUpdateEndpointMiddlewares(stack *middleware.Stack,
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -227,8 +227,6 @@ func (m *opUpdateEndpointResolveEndpointMiddleware) HandleSerialize(ctx context.
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/eventbridge/internal/customizations/endpoint.go b/service/eventbridge/internal/customizations/endpoint.go
index 1a3b71bb55e..06f9214b30d 100644
--- a/service/eventbridge/internal/customizations/endpoint.go
+++ b/service/eventbridge/internal/customizations/endpoint.go
@@ -52,8 +52,7 @@ func (u *updateEndpoint) HandleSerialize(ctx context.Context, in middleware.Seri
 	if !awsmiddleware.GetRequiresLegacyEndpoints(ctx) {
 		return next.HandleSerialize(ctx, in)
 	}
-	
-	
+
 	// If getEndpointIDFromInput is nil but the middleware got attached just skip to the next handler
 	if u.getEndpointIDFromInput == nil {
 		return next.HandleSerialize(ctx, in)
diff --git a/service/s3/api_client.go b/service/s3/api_client.go
index e91dfe0958b..3fdfb632e38 100644
--- a/service/s3/api_client.go
+++ b/service/s3/api_client.go
@@ -273,15 +273,15 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf
 
 type noSmithyDocumentSerde = smithydocument.NoSerde
 
-type LegacyEndpointContextSetter struct {
+type legacyEndpointContextSetter struct {
 	LegacyResolver EndpointResolver
 }
 
-func (*LegacyEndpointContextSetter) ID() string {
-	return "LegacyEndpointContextSetter"
+func (*legacyEndpointContextSetter) ID() string {
+	return "legacyEndpointContextSetter"
 }
 
-func (m *LegacyEndpointContextSetter) HandleInitialize(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) (
+func (m *legacyEndpointContextSetter) HandleInitialize(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) (
 	out middleware.InitializeOutput, metadata middleware.Metadata, err error,
 ) {
 	if m.LegacyResolver != nil {
@@ -291,8 +291,8 @@ func (m *LegacyEndpointContextSetter) HandleInitialize(ctx context.Context, in m
 	return next.HandleInitialize(ctx, in)
 
 }
-func addLegacyEndpointContextSetter(stack *middleware.Stack, o Options) error {
-	return stack.Initialize.Add(&LegacyEndpointContextSetter{
+func addlegacyEndpointContextSetter(stack *middleware.Stack, o Options) error {
+	return stack.Initialize.Add(&legacyEndpointContextSetter{
 		LegacyResolver: o.EndpointResolver,
 	}, middleware.Before)
 }
@@ -821,15 +821,15 @@ func addRequestResponseLogging(stack *middleware.Stack, o Options) error {
 	}, middleware.After)
 }
 
-type EndpointDisableHTTPSMiddleware struct {
+type endpointDisableHTTPSMiddleware struct {
 	EndpointDisableHTTPS bool
 }
 
-func (*EndpointDisableHTTPSMiddleware) ID() string {
-	return "EndpointDisableHTTPSMiddleware"
+func (*endpointDisableHTTPSMiddleware) ID() string {
+	return "endpointDisableHTTPSMiddleware"
 }
 
-func (m *EndpointDisableHTTPSMiddleware) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
+func (m *endpointDisableHTTPSMiddleware) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
 	out middleware.SerializeOutput, metadata middleware.Metadata, err error,
 ) {
 	req, ok := in.Request.(*smithyhttp.Request)
@@ -844,8 +844,8 @@ func (m *EndpointDisableHTTPSMiddleware) HandleSerialize(ctx context.Context, in
 	return next.HandleSerialize(ctx, in)
 
 }
-func addEndpointDisableHTTPSMiddleware(stack *middleware.Stack, o Options) error {
-	return stack.Serialize.Insert(&EndpointDisableHTTPSMiddleware{
+func addendpointDisableHTTPSMiddleware(stack *middleware.Stack, o Options) error {
+	return stack.Serialize.Insert(&endpointDisableHTTPSMiddleware{
 		EndpointDisableHTTPS: o.EndpointOptions.DisableHTTPS,
 	}, "ResolveEndpointV2", middleware.After)
 }
diff --git a/service/s3/api_op_AbortMultipartUpload.go b/service/s3/api_op_AbortMultipartUpload.go
index c5f319b4eec..87736ca3549 100644
--- a/service/s3/api_op_AbortMultipartUpload.go
+++ b/service/s3/api_op_AbortMultipartUpload.go
@@ -116,7 +116,7 @@ func (c *Client) addOperationAbortMultipartUploadMiddlewares(stack *middleware.S
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -188,7 +188,7 @@ func (c *Client) addOperationAbortMultipartUploadMiddlewares(stack *middleware.S
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -290,8 +290,6 @@ func (m *opAbortMultipartUploadResolveEndpointMiddleware) HandleSerialize(ctx co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_CompleteMultipartUpload.go b/service/s3/api_op_CompleteMultipartUpload.go
index 3e7068cbfd9..980eedd93d8 100644
--- a/service/s3/api_op_CompleteMultipartUpload.go
+++ b/service/s3/api_op_CompleteMultipartUpload.go
@@ -286,7 +286,7 @@ func (c *Client) addOperationCompleteMultipartUploadMiddlewares(stack *middlewar
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -361,7 +361,7 @@ func (c *Client) addOperationCompleteMultipartUploadMiddlewares(stack *middlewar
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -463,8 +463,6 @@ func (m *opCompleteMultipartUploadResolveEndpointMiddleware) HandleSerialize(ctx
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_CopyObject.go b/service/s3/api_op_CopyObject.go
index 930b555a06d..ef496f4ab5d 100644
--- a/service/s3/api_op_CopyObject.go
+++ b/service/s3/api_op_CopyObject.go
@@ -455,7 +455,7 @@ func (c *Client) addOperationCopyObjectMiddlewares(stack *middleware.Stack, opti
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -530,7 +530,7 @@ func (c *Client) addOperationCopyObjectMiddlewares(stack *middleware.Stack, opti
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -632,8 +632,6 @@ func (m *opCopyObjectResolveEndpointMiddleware) HandleSerialize(ctx context.Cont
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_CreateBucket.go b/service/s3/api_op_CreateBucket.go
index a3edf543499..1e951599402 100644
--- a/service/s3/api_op_CreateBucket.go
+++ b/service/s3/api_op_CreateBucket.go
@@ -182,7 +182,7 @@ func (c *Client) addOperationCreateBucketMiddlewares(stack *middleware.Stack, op
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -254,7 +254,7 @@ func (c *Client) addOperationCreateBucketMiddlewares(stack *middleware.Stack, op
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -358,8 +358,6 @@ func (m *opCreateBucketResolveEndpointMiddleware) HandleSerialize(ctx context.Co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_CreateMultipartUpload.go b/service/s3/api_op_CreateMultipartUpload.go
index 595431030e0..d74709e92e7 100644
--- a/service/s3/api_op_CreateMultipartUpload.go
+++ b/service/s3/api_op_CreateMultipartUpload.go
@@ -439,7 +439,7 @@ func (c *Client) addOperationCreateMultipartUploadMiddlewares(stack *middleware.
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -511,7 +511,7 @@ func (c *Client) addOperationCreateMultipartUploadMiddlewares(stack *middleware.
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -613,8 +613,6 @@ func (m *opCreateMultipartUploadResolveEndpointMiddleware) HandleSerialize(ctx c
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_DeleteBucket.go b/service/s3/api_op_DeleteBucket.go
index a696a5c24f8..1ec386b8139 100644
--- a/service/s3/api_op_DeleteBucket.go
+++ b/service/s3/api_op_DeleteBucket.go
@@ -67,7 +67,7 @@ func (c *Client) addOperationDeleteBucketMiddlewares(stack *middleware.Stack, op
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -139,7 +139,7 @@ func (c *Client) addOperationDeleteBucketMiddlewares(stack *middleware.Stack, op
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -272,8 +272,6 @@ func (m *opDeleteBucketResolveEndpointMiddleware) HandleSerialize(ctx context.Co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go b/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go
index 8b408955153..f18ba9220d8 100644
--- a/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go
+++ b/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go
@@ -80,7 +80,7 @@ func (c *Client) addOperationDeleteBucketAnalyticsConfigurationMiddlewares(stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -152,7 +152,7 @@ func (c *Client) addOperationDeleteBucketAnalyticsConfigurationMiddlewares(stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -254,8 +254,6 @@ func (m *opDeleteBucketAnalyticsConfigurationResolveEndpointMiddleware) HandleSe
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_DeleteBucketCors.go b/service/s3/api_op_DeleteBucketCors.go
index 846ce5b8b87..9ce689352cb 100644
--- a/service/s3/api_op_DeleteBucketCors.go
+++ b/service/s3/api_op_DeleteBucketCors.go
@@ -70,7 +70,7 @@ func (c *Client) addOperationDeleteBucketCorsMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -142,7 +142,7 @@ func (c *Client) addOperationDeleteBucketCorsMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -244,8 +244,6 @@ func (m *opDeleteBucketCorsResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_DeleteBucketEncryption.go b/service/s3/api_op_DeleteBucketEncryption.go
index 5248dd009e7..dc792b34edd 100644
--- a/service/s3/api_op_DeleteBucketEncryption.go
+++ b/service/s3/api_op_DeleteBucketEncryption.go
@@ -77,7 +77,7 @@ func (c *Client) addOperationDeleteBucketEncryptionMiddlewares(stack *middleware
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -149,7 +149,7 @@ func (c *Client) addOperationDeleteBucketEncryptionMiddlewares(stack *middleware
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -251,8 +251,6 @@ func (m *opDeleteBucketEncryptionResolveEndpointMiddleware) HandleSerialize(ctx
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_DeleteBucketIntelligentTieringConfiguration.go b/service/s3/api_op_DeleteBucketIntelligentTieringConfiguration.go
index dfde6921889..a1b8d460e28 100644
--- a/service/s3/api_op_DeleteBucketIntelligentTieringConfiguration.go
+++ b/service/s3/api_op_DeleteBucketIntelligentTieringConfiguration.go
@@ -81,7 +81,7 @@ func (c *Client) addOperationDeleteBucketIntelligentTieringConfigurationMiddlewa
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -153,7 +153,7 @@ func (c *Client) addOperationDeleteBucketIntelligentTieringConfigurationMiddlewa
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -255,8 +255,6 @@ func (m *opDeleteBucketIntelligentTieringConfigurationResolveEndpointMiddleware)
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_DeleteBucketInventoryConfiguration.go b/service/s3/api_op_DeleteBucketInventoryConfiguration.go
index db38672b02e..a33ef8dec5e 100644
--- a/service/s3/api_op_DeleteBucketInventoryConfiguration.go
+++ b/service/s3/api_op_DeleteBucketInventoryConfiguration.go
@@ -79,7 +79,7 @@ func (c *Client) addOperationDeleteBucketInventoryConfigurationMiddlewares(stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -151,7 +151,7 @@ func (c *Client) addOperationDeleteBucketInventoryConfigurationMiddlewares(stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -253,8 +253,6 @@ func (m *opDeleteBucketInventoryConfigurationResolveEndpointMiddleware) HandleSe
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_DeleteBucketLifecycle.go b/service/s3/api_op_DeleteBucketLifecycle.go
index f1a07cf4f32..7762595e5ba 100644
--- a/service/s3/api_op_DeleteBucketLifecycle.go
+++ b/service/s3/api_op_DeleteBucketLifecycle.go
@@ -75,7 +75,7 @@ func (c *Client) addOperationDeleteBucketLifecycleMiddlewares(stack *middleware.
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -147,7 +147,7 @@ func (c *Client) addOperationDeleteBucketLifecycleMiddlewares(stack *middleware.
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -249,8 +249,6 @@ func (m *opDeleteBucketLifecycleResolveEndpointMiddleware) HandleSerialize(ctx c
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_DeleteBucketMetricsConfiguration.go b/service/s3/api_op_DeleteBucketMetricsConfiguration.go
index 2d47d4a7c00..c746babce16 100644
--- a/service/s3/api_op_DeleteBucketMetricsConfiguration.go
+++ b/service/s3/api_op_DeleteBucketMetricsConfiguration.go
@@ -83,7 +83,7 @@ func (c *Client) addOperationDeleteBucketMetricsConfigurationMiddlewares(stack *
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -155,7 +155,7 @@ func (c *Client) addOperationDeleteBucketMetricsConfigurationMiddlewares(stack *
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -257,8 +257,6 @@ func (m *opDeleteBucketMetricsConfigurationResolveEndpointMiddleware) HandleSeri
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_DeleteBucketOwnershipControls.go b/service/s3/api_op_DeleteBucketOwnershipControls.go
index 034e746935f..39b71167bd0 100644
--- a/service/s3/api_op_DeleteBucketOwnershipControls.go
+++ b/service/s3/api_op_DeleteBucketOwnershipControls.go
@@ -69,7 +69,7 @@ func (c *Client) addOperationDeleteBucketOwnershipControlsMiddlewares(stack *mid
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -141,7 +141,7 @@ func (c *Client) addOperationDeleteBucketOwnershipControlsMiddlewares(stack *mid
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -243,8 +243,6 @@ func (m *opDeleteBucketOwnershipControlsResolveEndpointMiddleware) HandleSeriali
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_DeleteBucketPolicy.go b/service/s3/api_op_DeleteBucketPolicy.go
index 5fe8838d747..91e9f0fb48d 100644
--- a/service/s3/api_op_DeleteBucketPolicy.go
+++ b/service/s3/api_op_DeleteBucketPolicy.go
@@ -81,7 +81,7 @@ func (c *Client) addOperationDeleteBucketPolicyMiddlewares(stack *middleware.Sta
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -153,7 +153,7 @@ func (c *Client) addOperationDeleteBucketPolicyMiddlewares(stack *middleware.Sta
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -255,8 +255,6 @@ func (m *opDeleteBucketPolicyResolveEndpointMiddleware) HandleSerialize(ctx cont
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_DeleteBucketReplication.go b/service/s3/api_op_DeleteBucketReplication.go
index 36da73e9fa4..5993bb8baa2 100644
--- a/service/s3/api_op_DeleteBucketReplication.go
+++ b/service/s3/api_op_DeleteBucketReplication.go
@@ -74,7 +74,7 @@ func (c *Client) addOperationDeleteBucketReplicationMiddlewares(stack *middlewar
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -146,7 +146,7 @@ func (c *Client) addOperationDeleteBucketReplicationMiddlewares(stack *middlewar
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -248,8 +248,6 @@ func (m *opDeleteBucketReplicationResolveEndpointMiddleware) HandleSerialize(ctx
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_DeleteBucketTagging.go b/service/s3/api_op_DeleteBucketTagging.go
index 52228ee9521..b2236b4cd01 100644
--- a/service/s3/api_op_DeleteBucketTagging.go
+++ b/service/s3/api_op_DeleteBucketTagging.go
@@ -68,7 +68,7 @@ func (c *Client) addOperationDeleteBucketTaggingMiddlewares(stack *middleware.St
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -140,7 +140,7 @@ func (c *Client) addOperationDeleteBucketTaggingMiddlewares(stack *middleware.St
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -242,8 +242,6 @@ func (m *opDeleteBucketTaggingResolveEndpointMiddleware) HandleSerialize(ctx con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_DeleteBucketWebsite.go b/service/s3/api_op_DeleteBucketWebsite.go
index 9bc47fc1ac6..3499146862e 100644
--- a/service/s3/api_op_DeleteBucketWebsite.go
+++ b/service/s3/api_op_DeleteBucketWebsite.go
@@ -76,7 +76,7 @@ func (c *Client) addOperationDeleteBucketWebsiteMiddlewares(stack *middleware.St
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -148,7 +148,7 @@ func (c *Client) addOperationDeleteBucketWebsiteMiddlewares(stack *middleware.St
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -250,8 +250,6 @@ func (m *opDeleteBucketWebsiteResolveEndpointMiddleware) HandleSerialize(ctx con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_DeleteObject.go b/service/s3/api_op_DeleteObject.go
index 8f6ba26189f..548aa147e43 100644
--- a/service/s3/api_op_DeleteObject.go
+++ b/service/s3/api_op_DeleteObject.go
@@ -135,7 +135,7 @@ func (c *Client) addOperationDeleteObjectMiddlewares(stack *middleware.Stack, op
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -207,7 +207,7 @@ func (c *Client) addOperationDeleteObjectMiddlewares(stack *middleware.Stack, op
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -340,8 +340,6 @@ func (m *opDeleteObjectResolveEndpointMiddleware) HandleSerialize(ctx context.Co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_DeleteObjectTagging.go b/service/s3/api_op_DeleteObjectTagging.go
index 8bda34ec981..94e0dee895f 100644
--- a/service/s3/api_op_DeleteObjectTagging.go
+++ b/service/s3/api_op_DeleteObjectTagging.go
@@ -97,7 +97,7 @@ func (c *Client) addOperationDeleteObjectTaggingMiddlewares(stack *middleware.St
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -169,7 +169,7 @@ func (c *Client) addOperationDeleteObjectTaggingMiddlewares(stack *middleware.St
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -271,8 +271,6 @@ func (m *opDeleteObjectTaggingResolveEndpointMiddleware) HandleSerialize(ctx con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_DeleteObjects.go b/service/s3/api_op_DeleteObjects.go
index 666aa6f7267..6c3b206e607 100644
--- a/service/s3/api_op_DeleteObjects.go
+++ b/service/s3/api_op_DeleteObjects.go
@@ -156,7 +156,7 @@ func (c *Client) addOperationDeleteObjectsMiddlewares(stack *middleware.Stack, o
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -231,7 +231,7 @@ func (c *Client) addOperationDeleteObjectsMiddlewares(stack *middleware.Stack, o
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -353,8 +353,6 @@ func (m *opDeleteObjectsResolveEndpointMiddleware) HandleSerialize(ctx context.C
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_DeletePublicAccessBlock.go b/service/s3/api_op_DeletePublicAccessBlock.go
index c65a24907f5..8fb6d02599d 100644
--- a/service/s3/api_op_DeletePublicAccessBlock.go
+++ b/service/s3/api_op_DeletePublicAccessBlock.go
@@ -72,7 +72,7 @@ func (c *Client) addOperationDeletePublicAccessBlockMiddlewares(stack *middlewar
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -144,7 +144,7 @@ func (c *Client) addOperationDeletePublicAccessBlockMiddlewares(stack *middlewar
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -246,8 +246,6 @@ func (m *opDeletePublicAccessBlockResolveEndpointMiddleware) HandleSerialize(ctx
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetBucketAccelerateConfiguration.go b/service/s3/api_op_GetBucketAccelerateConfiguration.go
index 14a70dabc0a..dac0ace2844 100644
--- a/service/s3/api_op_GetBucketAccelerateConfiguration.go
+++ b/service/s3/api_op_GetBucketAccelerateConfiguration.go
@@ -86,7 +86,7 @@ func (c *Client) addOperationGetBucketAccelerateConfigurationMiddlewares(stack *
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -158,7 +158,7 @@ func (c *Client) addOperationGetBucketAccelerateConfigurationMiddlewares(stack *
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -260,8 +260,6 @@ func (m *opGetBucketAccelerateConfigurationResolveEndpointMiddleware) HandleSeri
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetBucketAcl.go b/service/s3/api_op_GetBucketAcl.go
index 04b96f7d362..6807f39b7f3 100644
--- a/service/s3/api_op_GetBucketAcl.go
+++ b/service/s3/api_op_GetBucketAcl.go
@@ -96,7 +96,7 @@ func (c *Client) addOperationGetBucketAclMiddlewares(stack *middleware.Stack, op
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -168,7 +168,7 @@ func (c *Client) addOperationGetBucketAclMiddlewares(stack *middleware.Stack, op
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -270,8 +270,6 @@ func (m *opGetBucketAclResolveEndpointMiddleware) HandleSerialize(ctx context.Co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetBucketAnalyticsConfiguration.go b/service/s3/api_op_GetBucketAnalyticsConfiguration.go
index e3ee5587682..00575643e1e 100644
--- a/service/s3/api_op_GetBucketAnalyticsConfiguration.go
+++ b/service/s3/api_op_GetBucketAnalyticsConfiguration.go
@@ -86,7 +86,7 @@ func (c *Client) addOperationGetBucketAnalyticsConfigurationMiddlewares(stack *m
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -158,7 +158,7 @@ func (c *Client) addOperationGetBucketAnalyticsConfigurationMiddlewares(stack *m
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -260,8 +260,6 @@ func (m *opGetBucketAnalyticsConfigurationResolveEndpointMiddleware) HandleSeria
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetBucketCors.go b/service/s3/api_op_GetBucketCors.go
index 7359ec73006..045d5c0dc78 100644
--- a/service/s3/api_op_GetBucketCors.go
+++ b/service/s3/api_op_GetBucketCors.go
@@ -89,7 +89,7 @@ func (c *Client) addOperationGetBucketCorsMiddlewares(stack *middleware.Stack, o
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -161,7 +161,7 @@ func (c *Client) addOperationGetBucketCorsMiddlewares(stack *middleware.Stack, o
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -263,8 +263,6 @@ func (m *opGetBucketCorsResolveEndpointMiddleware) HandleSerialize(ctx context.C
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetBucketEncryption.go b/service/s3/api_op_GetBucketEncryption.go
index 89dd34c8a77..5b79445c52f 100644
--- a/service/s3/api_op_GetBucketEncryption.go
+++ b/service/s3/api_op_GetBucketEncryption.go
@@ -82,7 +82,7 @@ func (c *Client) addOperationGetBucketEncryptionMiddlewares(stack *middleware.St
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -154,7 +154,7 @@ func (c *Client) addOperationGetBucketEncryptionMiddlewares(stack *middleware.St
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -256,8 +256,6 @@ func (m *opGetBucketEncryptionResolveEndpointMiddleware) HandleSerialize(ctx con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetBucketIntelligentTieringConfiguration.go b/service/s3/api_op_GetBucketIntelligentTieringConfiguration.go
index f4544afb411..221f222b1a3 100644
--- a/service/s3/api_op_GetBucketIntelligentTieringConfiguration.go
+++ b/service/s3/api_op_GetBucketIntelligentTieringConfiguration.go
@@ -86,7 +86,7 @@ func (c *Client) addOperationGetBucketIntelligentTieringConfigurationMiddlewares
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -158,7 +158,7 @@ func (c *Client) addOperationGetBucketIntelligentTieringConfigurationMiddlewares
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -260,8 +260,6 @@ func (m *opGetBucketIntelligentTieringConfigurationResolveEndpointMiddleware) Ha
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetBucketInventoryConfiguration.go b/service/s3/api_op_GetBucketInventoryConfiguration.go
index 609d3f6280d..3aa10d8e55d 100644
--- a/service/s3/api_op_GetBucketInventoryConfiguration.go
+++ b/service/s3/api_op_GetBucketInventoryConfiguration.go
@@ -83,7 +83,7 @@ func (c *Client) addOperationGetBucketInventoryConfigurationMiddlewares(stack *m
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -155,7 +155,7 @@ func (c *Client) addOperationGetBucketInventoryConfigurationMiddlewares(stack *m
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -257,8 +257,6 @@ func (m *opGetBucketInventoryConfigurationResolveEndpointMiddleware) HandleSeria
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetBucketLifecycleConfiguration.go b/service/s3/api_op_GetBucketLifecycleConfiguration.go
index d6848a9797a..adf6a76e1fd 100644
--- a/service/s3/api_op_GetBucketLifecycleConfiguration.go
+++ b/service/s3/api_op_GetBucketLifecycleConfiguration.go
@@ -92,7 +92,7 @@ func (c *Client) addOperationGetBucketLifecycleConfigurationMiddlewares(stack *m
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -164,7 +164,7 @@ func (c *Client) addOperationGetBucketLifecycleConfigurationMiddlewares(stack *m
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -266,8 +266,6 @@ func (m *opGetBucketLifecycleConfigurationResolveEndpointMiddleware) HandleSeria
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetBucketLocation.go b/service/s3/api_op_GetBucketLocation.go
index 107c63db574..ad72097213d 100644
--- a/service/s3/api_op_GetBucketLocation.go
+++ b/service/s3/api_op_GetBucketLocation.go
@@ -98,7 +98,7 @@ func (c *Client) addOperationGetBucketLocationMiddlewares(stack *middleware.Stac
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -173,7 +173,7 @@ func (c *Client) addOperationGetBucketLocationMiddlewares(stack *middleware.Stac
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -331,8 +331,6 @@ func (m *opGetBucketLocationResolveEndpointMiddleware) HandleSerialize(ctx conte
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetBucketLogging.go b/service/s3/api_op_GetBucketLogging.go
index 9c738288f06..def1bb836a6 100644
--- a/service/s3/api_op_GetBucketLogging.go
+++ b/service/s3/api_op_GetBucketLogging.go
@@ -74,7 +74,7 @@ func (c *Client) addOperationGetBucketLoggingMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -146,7 +146,7 @@ func (c *Client) addOperationGetBucketLoggingMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -248,8 +248,6 @@ func (m *opGetBucketLoggingResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetBucketMetricsConfiguration.go b/service/s3/api_op_GetBucketMetricsConfiguration.go
index 2b7b42a3b96..ed9493b6f0c 100644
--- a/service/s3/api_op_GetBucketMetricsConfiguration.go
+++ b/service/s3/api_op_GetBucketMetricsConfiguration.go
@@ -88,7 +88,7 @@ func (c *Client) addOperationGetBucketMetricsConfigurationMiddlewares(stack *mid
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -160,7 +160,7 @@ func (c *Client) addOperationGetBucketMetricsConfigurationMiddlewares(stack *mid
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -262,8 +262,6 @@ func (m *opGetBucketMetricsConfigurationResolveEndpointMiddleware) HandleSeriali
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetBucketNotificationConfiguration.go b/service/s3/api_op_GetBucketNotificationConfiguration.go
index 78b0512b3a0..44a0008081d 100644
--- a/service/s3/api_op_GetBucketNotificationConfiguration.go
+++ b/service/s3/api_op_GetBucketNotificationConfiguration.go
@@ -105,7 +105,7 @@ func (c *Client) addOperationGetBucketNotificationConfigurationMiddlewares(stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -177,7 +177,7 @@ func (c *Client) addOperationGetBucketNotificationConfigurationMiddlewares(stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -279,8 +279,6 @@ func (m *opGetBucketNotificationConfigurationResolveEndpointMiddleware) HandleSe
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetBucketOwnershipControls.go b/service/s3/api_op_GetBucketOwnershipControls.go
index 2576e5b02b9..b8a5c0fc5dc 100644
--- a/service/s3/api_op_GetBucketOwnershipControls.go
+++ b/service/s3/api_op_GetBucketOwnershipControls.go
@@ -75,7 +75,7 @@ func (c *Client) addOperationGetBucketOwnershipControlsMiddlewares(stack *middle
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -147,7 +147,7 @@ func (c *Client) addOperationGetBucketOwnershipControlsMiddlewares(stack *middle
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -249,8 +249,6 @@ func (m *opGetBucketOwnershipControlsResolveEndpointMiddleware) HandleSerialize(
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetBucketPolicy.go b/service/s3/api_op_GetBucketPolicy.go
index 8aaad8ed5d2..bf01ec839bd 100644
--- a/service/s3/api_op_GetBucketPolicy.go
+++ b/service/s3/api_op_GetBucketPolicy.go
@@ -97,7 +97,7 @@ func (c *Client) addOperationGetBucketPolicyMiddlewares(stack *middleware.Stack,
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -169,7 +169,7 @@ func (c *Client) addOperationGetBucketPolicyMiddlewares(stack *middleware.Stack,
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -271,8 +271,6 @@ func (m *opGetBucketPolicyResolveEndpointMiddleware) HandleSerialize(ctx context
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetBucketPolicyStatus.go b/service/s3/api_op_GetBucketPolicyStatus.go
index 1e91c5e9d92..e9b4dae985e 100644
--- a/service/s3/api_op_GetBucketPolicyStatus.go
+++ b/service/s3/api_op_GetBucketPolicyStatus.go
@@ -78,7 +78,7 @@ func (c *Client) addOperationGetBucketPolicyStatusMiddlewares(stack *middleware.
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -150,7 +150,7 @@ func (c *Client) addOperationGetBucketPolicyStatusMiddlewares(stack *middleware.
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -252,8 +252,6 @@ func (m *opGetBucketPolicyStatusResolveEndpointMiddleware) HandleSerialize(ctx c
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetBucketReplication.go b/service/s3/api_op_GetBucketReplication.go
index 50f1327f072..ecd833492b7 100644
--- a/service/s3/api_op_GetBucketReplication.go
+++ b/service/s3/api_op_GetBucketReplication.go
@@ -82,7 +82,7 @@ func (c *Client) addOperationGetBucketReplicationMiddlewares(stack *middleware.S
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -154,7 +154,7 @@ func (c *Client) addOperationGetBucketReplicationMiddlewares(stack *middleware.S
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -256,8 +256,6 @@ func (m *opGetBucketReplicationResolveEndpointMiddleware) HandleSerialize(ctx co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetBucketRequestPayment.go b/service/s3/api_op_GetBucketRequestPayment.go
index d7bca637579..e522b51058e 100644
--- a/service/s3/api_op_GetBucketRequestPayment.go
+++ b/service/s3/api_op_GetBucketRequestPayment.go
@@ -72,7 +72,7 @@ func (c *Client) addOperationGetBucketRequestPaymentMiddlewares(stack *middlewar
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -144,7 +144,7 @@ func (c *Client) addOperationGetBucketRequestPaymentMiddlewares(stack *middlewar
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -246,8 +246,6 @@ func (m *opGetBucketRequestPaymentResolveEndpointMiddleware) HandleSerialize(ctx
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetBucketTagging.go b/service/s3/api_op_GetBucketTagging.go
index bd5063eaa95..d6eccdc98e9 100644
--- a/service/s3/api_op_GetBucketTagging.go
+++ b/service/s3/api_op_GetBucketTagging.go
@@ -79,7 +79,7 @@ func (c *Client) addOperationGetBucketTaggingMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -151,7 +151,7 @@ func (c *Client) addOperationGetBucketTaggingMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -253,8 +253,6 @@ func (m *opGetBucketTaggingResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetBucketVersioning.go b/service/s3/api_op_GetBucketVersioning.go
index b723fcf09a2..3ed00c7194f 100644
--- a/service/s3/api_op_GetBucketVersioning.go
+++ b/service/s3/api_op_GetBucketVersioning.go
@@ -80,7 +80,7 @@ func (c *Client) addOperationGetBucketVersioningMiddlewares(stack *middleware.St
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -152,7 +152,7 @@ func (c *Client) addOperationGetBucketVersioningMiddlewares(stack *middleware.St
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -254,8 +254,6 @@ func (m *opGetBucketVersioningResolveEndpointMiddleware) HandleSerialize(ctx con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetBucketWebsite.go b/service/s3/api_op_GetBucketWebsite.go
index 486b6e5736b..06ce2eb9b4f 100644
--- a/service/s3/api_op_GetBucketWebsite.go
+++ b/service/s3/api_op_GetBucketWebsite.go
@@ -87,7 +87,7 @@ func (c *Client) addOperationGetBucketWebsiteMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -159,7 +159,7 @@ func (c *Client) addOperationGetBucketWebsiteMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -261,8 +261,6 @@ func (m *opGetBucketWebsiteResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetObject.go b/service/s3/api_op_GetObject.go
index e78804b88e6..6512bc9983b 100644
--- a/service/s3/api_op_GetObject.go
+++ b/service/s3/api_op_GetObject.go
@@ -405,7 +405,7 @@ func (c *Client) addOperationGetObjectMiddlewares(stack *middleware.Stack, optio
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -477,7 +477,7 @@ func (c *Client) addOperationGetObjectMiddlewares(stack *middleware.Stack, optio
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -629,8 +629,6 @@ func (m *opGetObjectResolveEndpointMiddleware) HandleSerialize(ctx context.Conte
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetObjectAcl.go b/service/s3/api_op_GetObjectAcl.go
index d02daa7eeba..f017ff32629 100644
--- a/service/s3/api_op_GetObjectAcl.go
+++ b/service/s3/api_op_GetObjectAcl.go
@@ -113,7 +113,7 @@ func (c *Client) addOperationGetObjectAclMiddlewares(stack *middleware.Stack, op
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -185,7 +185,7 @@ func (c *Client) addOperationGetObjectAclMiddlewares(stack *middleware.Stack, op
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -287,8 +287,6 @@ func (m *opGetObjectAclResolveEndpointMiddleware) HandleSerialize(ctx context.Co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetObjectAttributes.go b/service/s3/api_op_GetObjectAttributes.go
index 5e098b9afe6..3924dc5104a 100644
--- a/service/s3/api_op_GetObjectAttributes.go
+++ b/service/s3/api_op_GetObjectAttributes.go
@@ -215,7 +215,7 @@ func (c *Client) addOperationGetObjectAttributesMiddlewares(stack *middleware.St
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -287,7 +287,7 @@ func (c *Client) addOperationGetObjectAttributesMiddlewares(stack *middleware.St
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -389,8 +389,6 @@ func (m *opGetObjectAttributesResolveEndpointMiddleware) HandleSerialize(ctx con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetObjectLegalHold.go b/service/s3/api_op_GetObjectLegalHold.go
index a8391daacb3..f6bfb19d575 100644
--- a/service/s3/api_op_GetObjectLegalHold.go
+++ b/service/s3/api_op_GetObjectLegalHold.go
@@ -94,7 +94,7 @@ func (c *Client) addOperationGetObjectLegalHoldMiddlewares(stack *middleware.Sta
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -166,7 +166,7 @@ func (c *Client) addOperationGetObjectLegalHoldMiddlewares(stack *middleware.Sta
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -268,8 +268,6 @@ func (m *opGetObjectLegalHoldResolveEndpointMiddleware) HandleSerialize(ctx cont
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetObjectLockConfiguration.go b/service/s3/api_op_GetObjectLockConfiguration.go
index e08bb830557..26b3cfb86ce 100644
--- a/service/s3/api_op_GetObjectLockConfiguration.go
+++ b/service/s3/api_op_GetObjectLockConfiguration.go
@@ -79,7 +79,7 @@ func (c *Client) addOperationGetObjectLockConfigurationMiddlewares(stack *middle
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -151,7 +151,7 @@ func (c *Client) addOperationGetObjectLockConfigurationMiddlewares(stack *middle
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -253,8 +253,6 @@ func (m *opGetObjectLockConfigurationResolveEndpointMiddleware) HandleSerialize(
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetObjectRetention.go b/service/s3/api_op_GetObjectRetention.go
index e50545fc15b..e7da9d6ca9b 100644
--- a/service/s3/api_op_GetObjectRetention.go
+++ b/service/s3/api_op_GetObjectRetention.go
@@ -94,7 +94,7 @@ func (c *Client) addOperationGetObjectRetentionMiddlewares(stack *middleware.Sta
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -166,7 +166,7 @@ func (c *Client) addOperationGetObjectRetentionMiddlewares(stack *middleware.Sta
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -268,8 +268,6 @@ func (m *opGetObjectRetentionResolveEndpointMiddleware) HandleSerialize(ctx cont
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetObjectTagging.go b/service/s3/api_op_GetObjectTagging.go
index 52469ae0cf0..07bf411bd7c 100644
--- a/service/s3/api_op_GetObjectTagging.go
+++ b/service/s3/api_op_GetObjectTagging.go
@@ -114,7 +114,7 @@ func (c *Client) addOperationGetObjectTaggingMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -186,7 +186,7 @@ func (c *Client) addOperationGetObjectTaggingMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -288,8 +288,6 @@ func (m *opGetObjectTaggingResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetObjectTorrent.go b/service/s3/api_op_GetObjectTorrent.go
index 91f4f97b213..96a61cbb291 100644
--- a/service/s3/api_op_GetObjectTorrent.go
+++ b/service/s3/api_op_GetObjectTorrent.go
@@ -91,7 +91,7 @@ func (c *Client) addOperationGetObjectTorrentMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -160,7 +160,7 @@ func (c *Client) addOperationGetObjectTorrentMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -262,8 +262,6 @@ func (m *opGetObjectTorrentResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_GetPublicAccessBlock.go b/service/s3/api_op_GetPublicAccessBlock.go
index 1ae4752b76f..ab552904c11 100644
--- a/service/s3/api_op_GetPublicAccessBlock.go
+++ b/service/s3/api_op_GetPublicAccessBlock.go
@@ -85,7 +85,7 @@ func (c *Client) addOperationGetPublicAccessBlockMiddlewares(stack *middleware.S
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -157,7 +157,7 @@ func (c *Client) addOperationGetPublicAccessBlockMiddlewares(stack *middleware.S
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -259,8 +259,6 @@ func (m *opGetPublicAccessBlockResolveEndpointMiddleware) HandleSerialize(ctx co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_HeadBucket.go b/service/s3/api_op_HeadBucket.go
index 8968847f014..eaf7b6679ad 100644
--- a/service/s3/api_op_HeadBucket.go
+++ b/service/s3/api_op_HeadBucket.go
@@ -107,7 +107,7 @@ func (c *Client) addOperationHeadBucketMiddlewares(stack *middleware.Stack, opti
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -179,7 +179,7 @@ func (c *Client) addOperationHeadBucketMiddlewares(stack *middleware.Stack, opti
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -622,8 +622,6 @@ func (m *opHeadBucketResolveEndpointMiddleware) HandleSerialize(ctx context.Cont
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_HeadObject.go b/service/s3/api_op_HeadObject.go
index b0aae829adc..a815afa29b4 100644
--- a/service/s3/api_op_HeadObject.go
+++ b/service/s3/api_op_HeadObject.go
@@ -387,7 +387,7 @@ func (c *Client) addOperationHeadObjectMiddlewares(stack *middleware.Stack, opti
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -459,7 +459,7 @@ func (c *Client) addOperationHeadObjectMiddlewares(stack *middleware.Stack, opti
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -912,8 +912,6 @@ func (m *opHeadObjectResolveEndpointMiddleware) HandleSerialize(ctx context.Cont
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_ListBucketAnalyticsConfigurations.go b/service/s3/api_op_ListBucketAnalyticsConfigurations.go
index 3c3a7e75b93..399a0f7003b 100644
--- a/service/s3/api_op_ListBucketAnalyticsConfigurations.go
+++ b/service/s3/api_op_ListBucketAnalyticsConfigurations.go
@@ -105,7 +105,7 @@ func (c *Client) addOperationListBucketAnalyticsConfigurationsMiddlewares(stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -177,7 +177,7 @@ func (c *Client) addOperationListBucketAnalyticsConfigurationsMiddlewares(stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -279,8 +279,6 @@ func (m *opListBucketAnalyticsConfigurationsResolveEndpointMiddleware) HandleSer
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_ListBucketIntelligentTieringConfigurations.go b/service/s3/api_op_ListBucketIntelligentTieringConfigurations.go
index 3d7722608df..197be503a33 100644
--- a/service/s3/api_op_ListBucketIntelligentTieringConfigurations.go
+++ b/service/s3/api_op_ListBucketIntelligentTieringConfigurations.go
@@ -99,7 +99,7 @@ func (c *Client) addOperationListBucketIntelligentTieringConfigurationsMiddlewar
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -171,7 +171,7 @@ func (c *Client) addOperationListBucketIntelligentTieringConfigurationsMiddlewar
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -273,8 +273,6 @@ func (m *opListBucketIntelligentTieringConfigurationsResolveEndpointMiddleware)
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_ListBucketInventoryConfigurations.go b/service/s3/api_op_ListBucketInventoryConfigurations.go
index 9e608077c3f..2523f0d9ac2 100644
--- a/service/s3/api_op_ListBucketInventoryConfigurations.go
+++ b/service/s3/api_op_ListBucketInventoryConfigurations.go
@@ -106,7 +106,7 @@ func (c *Client) addOperationListBucketInventoryConfigurationsMiddlewares(stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -178,7 +178,7 @@ func (c *Client) addOperationListBucketInventoryConfigurationsMiddlewares(stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -280,8 +280,6 @@ func (m *opListBucketInventoryConfigurationsResolveEndpointMiddleware) HandleSer
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_ListBucketMetricsConfigurations.go b/service/s3/api_op_ListBucketMetricsConfigurations.go
index 3ea53af76c5..b5ad070b919 100644
--- a/service/s3/api_op_ListBucketMetricsConfigurations.go
+++ b/service/s3/api_op_ListBucketMetricsConfigurations.go
@@ -109,7 +109,7 @@ func (c *Client) addOperationListBucketMetricsConfigurationsMiddlewares(stack *m
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -181,7 +181,7 @@ func (c *Client) addOperationListBucketMetricsConfigurationsMiddlewares(stack *m
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -283,8 +283,6 @@ func (m *opListBucketMetricsConfigurationsResolveEndpointMiddleware) HandleSeria
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_ListBuckets.go b/service/s3/api_op_ListBuckets.go
index e30657b301a..fa87ba56979 100644
--- a/service/s3/api_op_ListBuckets.go
+++ b/service/s3/api_op_ListBuckets.go
@@ -64,7 +64,7 @@ func (c *Client) addOperationListBucketsMiddlewares(stack *middleware.Stack, opt
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -133,7 +133,7 @@ func (c *Client) addOperationListBucketsMiddlewares(stack *middleware.Stack, opt
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -211,8 +211,6 @@ func (m *opListBucketsResolveEndpointMiddleware) HandleSerialize(ctx context.Con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_ListMultipartUploads.go b/service/s3/api_op_ListMultipartUploads.go
index 877c0ad459e..9e9c2e4dd56 100644
--- a/service/s3/api_op_ListMultipartUploads.go
+++ b/service/s3/api_op_ListMultipartUploads.go
@@ -195,7 +195,7 @@ func (c *Client) addOperationListMultipartUploadsMiddlewares(stack *middleware.S
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -267,7 +267,7 @@ func (c *Client) addOperationListMultipartUploadsMiddlewares(stack *middleware.S
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -369,8 +369,6 @@ func (m *opListMultipartUploadsResolveEndpointMiddleware) HandleSerialize(ctx co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_ListObjectVersions.go b/service/s3/api_op_ListObjectVersions.go
index f5bb3270ada..df72c0ef72a 100644
--- a/service/s3/api_op_ListObjectVersions.go
+++ b/service/s3/api_op_ListObjectVersions.go
@@ -168,7 +168,7 @@ func (c *Client) addOperationListObjectVersionsMiddlewares(stack *middleware.Sta
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -240,7 +240,7 @@ func (c *Client) addOperationListObjectVersionsMiddlewares(stack *middleware.Sta
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -342,8 +342,6 @@ func (m *opListObjectVersionsResolveEndpointMiddleware) HandleSerialize(ctx cont
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_ListObjects.go b/service/s3/api_op_ListObjects.go
index f1b8ee9e159..e206efe214e 100644
--- a/service/s3/api_op_ListObjects.go
+++ b/service/s3/api_op_ListObjects.go
@@ -169,7 +169,7 @@ func (c *Client) addOperationListObjectsMiddlewares(stack *middleware.Stack, opt
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -241,7 +241,7 @@ func (c *Client) addOperationListObjectsMiddlewares(stack *middleware.Stack, opt
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -343,8 +343,6 @@ func (m *opListObjectsResolveEndpointMiddleware) HandleSerialize(ctx context.Con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_ListObjectsV2.go b/service/s3/api_op_ListObjectsV2.go
index 4fd03c040d8..f3e6a001c77 100644
--- a/service/s3/api_op_ListObjectsV2.go
+++ b/service/s3/api_op_ListObjectsV2.go
@@ -204,7 +204,7 @@ func (c *Client) addOperationListObjectsV2Middlewares(stack *middleware.Stack, o
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -276,7 +276,7 @@ func (c *Client) addOperationListObjectsV2Middlewares(stack *middleware.Stack, o
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -468,8 +468,6 @@ func (m *opListObjectsV2ResolveEndpointMiddleware) HandleSerialize(ctx context.C
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_ListParts.go b/service/s3/api_op_ListParts.go
index fc644264cc3..375903c0694 100644
--- a/service/s3/api_op_ListParts.go
+++ b/service/s3/api_op_ListParts.go
@@ -212,7 +212,7 @@ func (c *Client) addOperationListPartsMiddlewares(stack *middleware.Stack, optio
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -284,7 +284,7 @@ func (c *Client) addOperationListPartsMiddlewares(stack *middleware.Stack, optio
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -473,8 +473,6 @@ func (m *opListPartsResolveEndpointMiddleware) HandleSerialize(ctx context.Conte
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutBucketAccelerateConfiguration.go b/service/s3/api_op_PutBucketAccelerateConfiguration.go
index 83c6ee420b2..f578cf65c85 100644
--- a/service/s3/api_op_PutBucketAccelerateConfiguration.go
+++ b/service/s3/api_op_PutBucketAccelerateConfiguration.go
@@ -102,7 +102,7 @@ func (c *Client) addOperationPutBucketAccelerateConfigurationMiddlewares(stack *
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -177,7 +177,7 @@ func (c *Client) addOperationPutBucketAccelerateConfigurationMiddlewares(stack *
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -299,8 +299,6 @@ func (m *opPutBucketAccelerateConfigurationResolveEndpointMiddleware) HandleSeri
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutBucketAcl.go b/service/s3/api_op_PutBucketAcl.go
index e0314fcda68..c4987fb73d6 100644
--- a/service/s3/api_op_PutBucketAcl.go
+++ b/service/s3/api_op_PutBucketAcl.go
@@ -187,7 +187,7 @@ func (c *Client) addOperationPutBucketAclMiddlewares(stack *middleware.Stack, op
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -262,7 +262,7 @@ func (c *Client) addOperationPutBucketAclMiddlewares(stack *middleware.Stack, op
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -384,8 +384,6 @@ func (m *opPutBucketAclResolveEndpointMiddleware) HandleSerialize(ctx context.Co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutBucketAnalyticsConfiguration.go b/service/s3/api_op_PutBucketAnalyticsConfiguration.go
index 2579ce3689b..6e89fa52868 100644
--- a/service/s3/api_op_PutBucketAnalyticsConfiguration.go
+++ b/service/s3/api_op_PutBucketAnalyticsConfiguration.go
@@ -112,7 +112,7 @@ func (c *Client) addOperationPutBucketAnalyticsConfigurationMiddlewares(stack *m
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -184,7 +184,7 @@ func (c *Client) addOperationPutBucketAnalyticsConfigurationMiddlewares(stack *m
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -286,8 +286,6 @@ func (m *opPutBucketAnalyticsConfigurationResolveEndpointMiddleware) HandleSeria
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutBucketCors.go b/service/s3/api_op_PutBucketCors.go
index f9e33728045..b71355809fd 100644
--- a/service/s3/api_op_PutBucketCors.go
+++ b/service/s3/api_op_PutBucketCors.go
@@ -116,7 +116,7 @@ func (c *Client) addOperationPutBucketCorsMiddlewares(stack *middleware.Stack, o
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -191,7 +191,7 @@ func (c *Client) addOperationPutBucketCorsMiddlewares(stack *middleware.Stack, o
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -313,8 +313,6 @@ func (m *opPutBucketCorsResolveEndpointMiddleware) HandleSerialize(ctx context.C
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutBucketEncryption.go b/service/s3/api_op_PutBucketEncryption.go
index 832e8613de4..ca8f56f69f0 100644
--- a/service/s3/api_op_PutBucketEncryption.go
+++ b/service/s3/api_op_PutBucketEncryption.go
@@ -115,7 +115,7 @@ func (c *Client) addOperationPutBucketEncryptionMiddlewares(stack *middleware.St
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -190,7 +190,7 @@ func (c *Client) addOperationPutBucketEncryptionMiddlewares(stack *middleware.St
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -312,8 +312,6 @@ func (m *opPutBucketEncryptionResolveEndpointMiddleware) HandleSerialize(ctx con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutBucketIntelligentTieringConfiguration.go b/service/s3/api_op_PutBucketIntelligentTieringConfiguration.go
index 46fcbc57adb..364dc0df7f3 100644
--- a/service/s3/api_op_PutBucketIntelligentTieringConfiguration.go
+++ b/service/s3/api_op_PutBucketIntelligentTieringConfiguration.go
@@ -99,7 +99,7 @@ func (c *Client) addOperationPutBucketIntelligentTieringConfigurationMiddlewares
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -171,7 +171,7 @@ func (c *Client) addOperationPutBucketIntelligentTieringConfigurationMiddlewares
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -273,8 +273,6 @@ func (m *opPutBucketIntelligentTieringConfigurationResolveEndpointMiddleware) Ha
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutBucketInventoryConfiguration.go b/service/s3/api_op_PutBucketInventoryConfiguration.go
index 92aa7890612..76f375f56c5 100644
--- a/service/s3/api_op_PutBucketInventoryConfiguration.go
+++ b/service/s3/api_op_PutBucketInventoryConfiguration.go
@@ -115,7 +115,7 @@ func (c *Client) addOperationPutBucketInventoryConfigurationMiddlewares(stack *m
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -187,7 +187,7 @@ func (c *Client) addOperationPutBucketInventoryConfigurationMiddlewares(stack *m
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -289,8 +289,6 @@ func (m *opPutBucketInventoryConfigurationResolveEndpointMiddleware) HandleSeria
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutBucketLifecycleConfiguration.go b/service/s3/api_op_PutBucketLifecycleConfiguration.go
index 9e2fa8ff8f5..867f3136841 100644
--- a/service/s3/api_op_PutBucketLifecycleConfiguration.go
+++ b/service/s3/api_op_PutBucketLifecycleConfiguration.go
@@ -127,7 +127,7 @@ func (c *Client) addOperationPutBucketLifecycleConfigurationMiddlewares(stack *m
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -202,7 +202,7 @@ func (c *Client) addOperationPutBucketLifecycleConfigurationMiddlewares(stack *m
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -324,8 +324,6 @@ func (m *opPutBucketLifecycleConfigurationResolveEndpointMiddleware) HandleSeria
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutBucketLogging.go b/service/s3/api_op_PutBucketLogging.go
index 2ecd1b1f58b..1da3d5de58c 100644
--- a/service/s3/api_op_PutBucketLogging.go
+++ b/service/s3/api_op_PutBucketLogging.go
@@ -117,7 +117,7 @@ func (c *Client) addOperationPutBucketLoggingMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -192,7 +192,7 @@ func (c *Client) addOperationPutBucketLoggingMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -314,8 +314,6 @@ func (m *opPutBucketLoggingResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutBucketMetricsConfiguration.go b/service/s3/api_op_PutBucketMetricsConfiguration.go
index 991fad6cb8e..eebecb6430f 100644
--- a/service/s3/api_op_PutBucketMetricsConfiguration.go
+++ b/service/s3/api_op_PutBucketMetricsConfiguration.go
@@ -96,7 +96,7 @@ func (c *Client) addOperationPutBucketMetricsConfigurationMiddlewares(stack *mid
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -168,7 +168,7 @@ func (c *Client) addOperationPutBucketMetricsConfigurationMiddlewares(stack *mid
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -270,8 +270,6 @@ func (m *opPutBucketMetricsConfigurationResolveEndpointMiddleware) HandleSeriali
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutBucketNotificationConfiguration.go b/service/s3/api_op_PutBucketNotificationConfiguration.go
index 2b8be45ace5..3d71cea42b5 100644
--- a/service/s3/api_op_PutBucketNotificationConfiguration.go
+++ b/service/s3/api_op_PutBucketNotificationConfiguration.go
@@ -107,7 +107,7 @@ func (c *Client) addOperationPutBucketNotificationConfigurationMiddlewares(stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -179,7 +179,7 @@ func (c *Client) addOperationPutBucketNotificationConfigurationMiddlewares(stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -281,8 +281,6 @@ func (m *opPutBucketNotificationConfigurationResolveEndpointMiddleware) HandleSe
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutBucketOwnershipControls.go b/service/s3/api_op_PutBucketOwnershipControls.go
index d31468f9daf..6a4c0f2c10e 100644
--- a/service/s3/api_op_PutBucketOwnershipControls.go
+++ b/service/s3/api_op_PutBucketOwnershipControls.go
@@ -82,7 +82,7 @@ func (c *Client) addOperationPutBucketOwnershipControlsMiddlewares(stack *middle
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -157,7 +157,7 @@ func (c *Client) addOperationPutBucketOwnershipControlsMiddlewares(stack *middle
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -269,8 +269,6 @@ func (m *opPutBucketOwnershipControlsResolveEndpointMiddleware) HandleSerialize(
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutBucketPolicy.go b/service/s3/api_op_PutBucketPolicy.go
index 89eb31bb0df..f79b544f672 100644
--- a/service/s3/api_op_PutBucketPolicy.go
+++ b/service/s3/api_op_PutBucketPolicy.go
@@ -106,7 +106,7 @@ func (c *Client) addOperationPutBucketPolicyMiddlewares(stack *middleware.Stack,
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -181,7 +181,7 @@ func (c *Client) addOperationPutBucketPolicyMiddlewares(stack *middleware.Stack,
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -303,8 +303,6 @@ func (m *opPutBucketPolicyResolveEndpointMiddleware) HandleSerialize(ctx context
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutBucketReplication.go b/service/s3/api_op_PutBucketReplication.go
index 8370e37cc2b..3d7ba414b01 100644
--- a/service/s3/api_op_PutBucketReplication.go
+++ b/service/s3/api_op_PutBucketReplication.go
@@ -129,7 +129,7 @@ func (c *Client) addOperationPutBucketReplicationMiddlewares(stack *middleware.S
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -204,7 +204,7 @@ func (c *Client) addOperationPutBucketReplicationMiddlewares(stack *middleware.S
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -326,8 +326,6 @@ func (m *opPutBucketReplicationResolveEndpointMiddleware) HandleSerialize(ctx co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutBucketRequestPayment.go b/service/s3/api_op_PutBucketRequestPayment.go
index 7a978f23ef8..22ae5f22505 100644
--- a/service/s3/api_op_PutBucketRequestPayment.go
+++ b/service/s3/api_op_PutBucketRequestPayment.go
@@ -93,7 +93,7 @@ func (c *Client) addOperationPutBucketRequestPaymentMiddlewares(stack *middlewar
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -168,7 +168,7 @@ func (c *Client) addOperationPutBucketRequestPaymentMiddlewares(stack *middlewar
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -290,8 +290,6 @@ func (m *opPutBucketRequestPaymentResolveEndpointMiddleware) HandleSerialize(ctx
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutBucketTagging.go b/service/s3/api_op_PutBucketTagging.go
index ef3b422c35b..39d8d4e8814 100644
--- a/service/s3/api_op_PutBucketTagging.go
+++ b/service/s3/api_op_PutBucketTagging.go
@@ -121,7 +121,7 @@ func (c *Client) addOperationPutBucketTaggingMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -196,7 +196,7 @@ func (c *Client) addOperationPutBucketTaggingMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -318,8 +318,6 @@ func (m *opPutBucketTaggingResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutBucketVersioning.go b/service/s3/api_op_PutBucketVersioning.go
index 764cbab554f..83d020e0341 100644
--- a/service/s3/api_op_PutBucketVersioning.go
+++ b/service/s3/api_op_PutBucketVersioning.go
@@ -111,7 +111,7 @@ func (c *Client) addOperationPutBucketVersioningMiddlewares(stack *middleware.St
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -186,7 +186,7 @@ func (c *Client) addOperationPutBucketVersioningMiddlewares(stack *middleware.St
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -308,8 +308,6 @@ func (m *opPutBucketVersioningResolveEndpointMiddleware) HandleSerialize(ctx con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutBucketWebsite.go b/service/s3/api_op_PutBucketWebsite.go
index 1de48eb53a7..2ba0b65587c 100644
--- a/service/s3/api_op_PutBucketWebsite.go
+++ b/service/s3/api_op_PutBucketWebsite.go
@@ -129,7 +129,7 @@ func (c *Client) addOperationPutBucketWebsiteMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -204,7 +204,7 @@ func (c *Client) addOperationPutBucketWebsiteMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -326,8 +326,6 @@ func (m *opPutBucketWebsiteResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutObject.go b/service/s3/api_op_PutObject.go
index f5c5c497e70..9c1c3abbd2f 100644
--- a/service/s3/api_op_PutObject.go
+++ b/service/s3/api_op_PutObject.go
@@ -426,7 +426,7 @@ func (c *Client) addOperationPutObjectMiddlewares(stack *middleware.Stack, optio
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -507,7 +507,7 @@ func (c *Client) addOperationPutObjectMiddlewares(stack *middleware.Stack, optio
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -662,8 +662,6 @@ func (m *opPutObjectResolveEndpointMiddleware) HandleSerialize(ctx context.Conte
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutObjectAcl.go b/service/s3/api_op_PutObjectAcl.go
index 0cc4192cd62..787e7fd14dd 100644
--- a/service/s3/api_op_PutObjectAcl.go
+++ b/service/s3/api_op_PutObjectAcl.go
@@ -231,7 +231,7 @@ func (c *Client) addOperationPutObjectAclMiddlewares(stack *middleware.Stack, op
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -306,7 +306,7 @@ func (c *Client) addOperationPutObjectAclMiddlewares(stack *middleware.Stack, op
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -428,8 +428,6 @@ func (m *opPutObjectAclResolveEndpointMiddleware) HandleSerialize(ctx context.Co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutObjectLegalHold.go b/service/s3/api_op_PutObjectLegalHold.go
index 872016abe36..56a63e62239 100644
--- a/service/s3/api_op_PutObjectLegalHold.go
+++ b/service/s3/api_op_PutObjectLegalHold.go
@@ -113,7 +113,7 @@ func (c *Client) addOperationPutObjectLegalHoldMiddlewares(stack *middleware.Sta
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -188,7 +188,7 @@ func (c *Client) addOperationPutObjectLegalHoldMiddlewares(stack *middleware.Sta
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -310,8 +310,6 @@ func (m *opPutObjectLegalHoldResolveEndpointMiddleware) HandleSerialize(ctx cont
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutObjectLockConfiguration.go b/service/s3/api_op_PutObjectLockConfiguration.go
index 4636df950ec..1fe29a0bfe1 100644
--- a/service/s3/api_op_PutObjectLockConfiguration.go
+++ b/service/s3/api_op_PutObjectLockConfiguration.go
@@ -106,7 +106,7 @@ func (c *Client) addOperationPutObjectLockConfigurationMiddlewares(stack *middle
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -181,7 +181,7 @@ func (c *Client) addOperationPutObjectLockConfigurationMiddlewares(stack *middle
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -303,8 +303,6 @@ func (m *opPutObjectLockConfigurationResolveEndpointMiddleware) HandleSerialize(
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutObjectRetention.go b/service/s3/api_op_PutObjectRetention.go
index ea39be72834..d88109cb743 100644
--- a/service/s3/api_op_PutObjectRetention.go
+++ b/service/s3/api_op_PutObjectRetention.go
@@ -120,7 +120,7 @@ func (c *Client) addOperationPutObjectRetentionMiddlewares(stack *middleware.Sta
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -195,7 +195,7 @@ func (c *Client) addOperationPutObjectRetentionMiddlewares(stack *middleware.Sta
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -317,8 +317,6 @@ func (m *opPutObjectRetentionResolveEndpointMiddleware) HandleSerialize(ctx cont
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutObjectTagging.go b/service/s3/api_op_PutObjectTagging.go
index 8e3fbbbe7ef..a4ebef6b8cb 100644
--- a/service/s3/api_op_PutObjectTagging.go
+++ b/service/s3/api_op_PutObjectTagging.go
@@ -147,7 +147,7 @@ func (c *Client) addOperationPutObjectTaggingMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -222,7 +222,7 @@ func (c *Client) addOperationPutObjectTaggingMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -344,8 +344,6 @@ func (m *opPutObjectTaggingResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_PutPublicAccessBlock.go b/service/s3/api_op_PutPublicAccessBlock.go
index 4b4167d52da..b464ee36e96 100644
--- a/service/s3/api_op_PutPublicAccessBlock.go
+++ b/service/s3/api_op_PutPublicAccessBlock.go
@@ -105,7 +105,7 @@ func (c *Client) addOperationPutPublicAccessBlockMiddlewares(stack *middleware.S
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -180,7 +180,7 @@ func (c *Client) addOperationPutPublicAccessBlockMiddlewares(stack *middleware.S
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -302,8 +302,6 @@ func (m *opPutPublicAccessBlockResolveEndpointMiddleware) HandleSerialize(ctx co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_RestoreObject.go b/service/s3/api_op_RestoreObject.go
index 986b896a73d..978d5dfef51 100644
--- a/service/s3/api_op_RestoreObject.go
+++ b/service/s3/api_op_RestoreObject.go
@@ -262,7 +262,7 @@ func (c *Client) addOperationRestoreObjectMiddlewares(stack *middleware.Stack, o
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -337,7 +337,7 @@ func (c *Client) addOperationRestoreObjectMiddlewares(stack *middleware.Stack, o
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -459,8 +459,6 @@ func (m *opRestoreObjectResolveEndpointMiddleware) HandleSerialize(ctx context.C
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_SelectObjectContent.go b/service/s3/api_op_SelectObjectContent.go
index da5b3b0637b..89a3569b683 100644
--- a/service/s3/api_op_SelectObjectContent.go
+++ b/service/s3/api_op_SelectObjectContent.go
@@ -193,7 +193,7 @@ func (c *Client) addOperationSelectObjectContentMiddlewares(stack *middleware.St
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addEventStreamSelectObjectContentMiddleware(stack, options); err != nil {
@@ -262,7 +262,7 @@ func (c *Client) addOperationSelectObjectContentMiddlewares(stack *middleware.St
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -464,8 +464,6 @@ func (m *opSelectObjectContentResolveEndpointMiddleware) HandleSerialize(ctx con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_UploadPart.go b/service/s3/api_op_UploadPart.go
index 3032a9039b4..270ee7d64e7 100644
--- a/service/s3/api_op_UploadPart.go
+++ b/service/s3/api_op_UploadPart.go
@@ -302,7 +302,7 @@ func (c *Client) addOperationUploadPartMiddlewares(stack *middleware.Stack, opti
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -383,7 +383,7 @@ func (c *Client) addOperationUploadPartMiddlewares(stack *middleware.Stack, opti
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -539,8 +539,6 @@ func (m *opUploadPartResolveEndpointMiddleware) HandleSerialize(ctx context.Cont
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_UploadPartCopy.go b/service/s3/api_op_UploadPartCopy.go
index d4bd9948bee..31bf7eceec0 100644
--- a/service/s3/api_op_UploadPartCopy.go
+++ b/service/s3/api_op_UploadPartCopy.go
@@ -291,7 +291,7 @@ func (c *Client) addOperationUploadPartCopyMiddlewares(stack *middleware.Stack,
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -366,7 +366,7 @@ func (c *Client) addOperationUploadPartCopyMiddlewares(stack *middleware.Stack,
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -468,8 +468,6 @@ func (m *opUploadPartCopyResolveEndpointMiddleware) HandleSerialize(ctx context.
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/api_op_WriteGetObjectResponse.go b/service/s3/api_op_WriteGetObjectResponse.go
index 27caebf5bdc..7def65f61a0 100644
--- a/service/s3/api_op_WriteGetObjectResponse.go
+++ b/service/s3/api_op_WriteGetObjectResponse.go
@@ -299,7 +299,7 @@ func (c *Client) addOperationWriteGetObjectResponseMiddlewares(stack *middleware
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -377,7 +377,7 @@ func (c *Client) addOperationWriteGetObjectResponseMiddlewares(stack *middleware
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	if err = addSerializeImmutableHostnameBucketMiddleware(stack, options); err != nil {
@@ -498,8 +498,6 @@ func (m *opWriteGetObjectResponseResolveEndpointMiddleware) HandleSerialize(ctx
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3/internal/customizations/update_endpoint.go b/service/s3/internal/customizations/update_endpoint.go
index 95c96cb45d1..eedfc7eefa4 100644
--- a/service/s3/internal/customizations/update_endpoint.go
+++ b/service/s3/internal/customizations/update_endpoint.go
@@ -71,7 +71,7 @@ func UpdateEndpoint(stack *middleware.Stack, options UpdateEndpointOptions) (err
 	// initial arn look up middleware
 	err = stack.Initialize.Insert(&s3shared.ARNLookup{
 		GetARNValue: options.Accessor.GetBucketFromInput,
-	}, "LegacyEndpointContextSetter", middleware.After)
+	}, "legacyEndpointContextSetter", middleware.After)
 	if err != nil {
 		return err
 	}
diff --git a/service/s3/internal/customizations/update_endpoint_test.go b/service/s3/internal/customizations/update_endpoint_test.go
index 01515e5ebcc..176c58f27cb 100644
--- a/service/s3/internal/customizations/update_endpoint_test.go
+++ b/service/s3/internal/customizations/update_endpoint_test.go
@@ -873,7 +873,9 @@ func TestEndpointWithARN(t *testing.T) {
 				Region:       "us-west-2",
 				UseARNRegion: true,
 			},
-			expectedErr: "FIPS region not allowed in ARN",
+			expectedReqURL:        "https://myendpoint-123456789012.s3-accesspoint.fips-us-east-1.amazonaws.com/testkey?x-id=GetObject",
+			expectedSigningName:   "s3",
+			expectedSigningRegion: "fips-us-east-1",
 		},
 		"Invalid AccessPoint ARN with FIPS pseudo-region (suffix)": {
 			bucket: "arn:aws:s3:us-east-1-fips:123456789012:accesspoint:myendpoint",
@@ -881,7 +883,9 @@ func TestEndpointWithARN(t *testing.T) {
 				Region:       "us-west-2",
 				UseARNRegion: true,
 			},
-			expectedErr: "FIPS region not allowed in ARN",
+			expectedReqURL:        "https://myendpoint-123456789012.s3-accesspoint.us-east-1-fips.amazonaws.com/testkey?x-id=GetObject",
+			expectedSigningName:   "s3",
+			expectedSigningRegion: "us-east-1-fips",
 		},
 		"Invalid Outpost AccessPoint ARN with FIPS pseudo-region (prefix)": {
 			bucket: "arn:aws:s3-outposts:fips-us-east-1:123456789012:outpost:op-01234567890123456:accesspoint:myaccesspoint",
@@ -889,7 +893,9 @@ func TestEndpointWithARN(t *testing.T) {
 				Region:       "us-west-2",
 				UseARNRegion: true,
 			},
-			expectedErr: "FIPS region not allowed in ARN",
+			expectedReqURL:        "https://myaccesspoint-123456789012.op-01234567890123456.s3-outposts.fips-us-east-1.amazonaws.com/testkey?x-id=GetObject",
+			expectedSigningName:   "s3-outposts",
+			expectedSigningRegion: "fips-us-east-1",
 		},
 		"Invalid Outpost AccessPoint ARN with FIPS pseudo-region (suffix)": {
 			bucket: "arn:aws:s3-outposts:us-east-1-fips:123456789012:outpost:op-01234567890123456:accesspoint:myaccesspoint",
@@ -897,7 +903,9 @@ func TestEndpointWithARN(t *testing.T) {
 				Region:       "us-west-2",
 				UseARNRegion: true,
 			},
-			expectedErr: "FIPS region not allowed in ARN",
+			expectedReqURL:        "https://myaccesspoint-123456789012.op-01234567890123456.s3-outposts.us-east-1-fips.amazonaws.com/testkey?x-id=GetObject",
+			expectedSigningName:   "s3-outposts",
+			expectedSigningRegion: "us-east-1-fips",
 		},
 		"Invalid Object Lambda ARN with FIPS pseudo-region (prefix)": {
 			bucket: "arn:aws:s3-object-lambda:fips-us-east-1:123456789012:accesspoint/myap",
@@ -905,7 +913,9 @@ func TestEndpointWithARN(t *testing.T) {
 				Region:       "us-west-2",
 				UseARNRegion: true,
 			},
-			expectedErr: "FIPS region not allowed in ARN",
+			expectedReqURL:        "https://myap-123456789012.s3-object-lambda.fips-us-east-1.amazonaws.com/testkey?x-id=GetObject",
+			expectedSigningName:   "s3-object-lambda",
+			expectedSigningRegion: "fips-us-east-1",
 		},
 		"Invalid Object Lambda ARN with FIPS pseudo-region (suffix)": {
 			bucket: "arn:aws:s3-object-lambda:us-east-1-fips:123456789012:accesspoint/myap",
@@ -913,8 +923,9 @@ func TestEndpointWithARN(t *testing.T) {
 				Region:       "us-west-2",
 				UseARNRegion: true,
 			},
-			expectedErr: "FIPS region not allowed in ARN",
-		},
+			expectedReqURL:        "https://myap-123456789012.s3-object-lambda.us-east-1-fips.amazonaws.com/testkey?x-id=GetObject",
+			expectedSigningName:   "s3-object-lambda",
+			expectedSigningRegion: "us-east-1-fips"},
 	}
 
 	for name, c := range cases {
diff --git a/service/s3control/api_client.go b/service/s3control/api_client.go
index 5b58dd5ef71..cbc7fdd8643 100644
--- a/service/s3control/api_client.go
+++ b/service/s3control/api_client.go
@@ -243,15 +243,15 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf
 
 type noSmithyDocumentSerde = smithydocument.NoSerde
 
-type LegacyEndpointContextSetter struct {
+type legacyEndpointContextSetter struct {
 	LegacyResolver EndpointResolver
 }
 
-func (*LegacyEndpointContextSetter) ID() string {
-	return "LegacyEndpointContextSetter"
+func (*legacyEndpointContextSetter) ID() string {
+	return "legacyEndpointContextSetter"
 }
 
-func (m *LegacyEndpointContextSetter) HandleInitialize(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) (
+func (m *legacyEndpointContextSetter) HandleInitialize(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) (
 	out middleware.InitializeOutput, metadata middleware.Metadata, err error,
 ) {
 	if m.LegacyResolver != nil {
@@ -261,8 +261,8 @@ func (m *LegacyEndpointContextSetter) HandleInitialize(ctx context.Context, in m
 	return next.HandleInitialize(ctx, in)
 
 }
-func addLegacyEndpointContextSetter(stack *middleware.Stack, o Options) error {
-	return stack.Initialize.Add(&LegacyEndpointContextSetter{
+func addlegacyEndpointContextSetter(stack *middleware.Stack, o Options) error {
+	return stack.Initialize.Add(&legacyEndpointContextSetter{
 		LegacyResolver: o.EndpointResolver,
 	}, middleware.Before)
 }
@@ -566,15 +566,15 @@ func addRequestResponseLogging(stack *middleware.Stack, o Options) error {
 	}, middleware.After)
 }
 
-type EndpointDisableHTTPSMiddleware struct {
+type endpointDisableHTTPSMiddleware struct {
 	EndpointDisableHTTPS bool
 }
 
-func (*EndpointDisableHTTPSMiddleware) ID() string {
-	return "EndpointDisableHTTPSMiddleware"
+func (*endpointDisableHTTPSMiddleware) ID() string {
+	return "endpointDisableHTTPSMiddleware"
 }
 
-func (m *EndpointDisableHTTPSMiddleware) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
+func (m *endpointDisableHTTPSMiddleware) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
 	out middleware.SerializeOutput, metadata middleware.Metadata, err error,
 ) {
 	req, ok := in.Request.(*smithyhttp.Request)
@@ -589,8 +589,8 @@ func (m *EndpointDisableHTTPSMiddleware) HandleSerialize(ctx context.Context, in
 	return next.HandleSerialize(ctx, in)
 
 }
-func addEndpointDisableHTTPSMiddleware(stack *middleware.Stack, o Options) error {
-	return stack.Serialize.Insert(&EndpointDisableHTTPSMiddleware{
+func addendpointDisableHTTPSMiddleware(stack *middleware.Stack, o Options) error {
+	return stack.Serialize.Insert(&endpointDisableHTTPSMiddleware{
 		EndpointDisableHTTPS: o.EndpointOptions.DisableHTTPS,
 	}, "ResolveEndpointV2", middleware.After)
 }
diff --git a/service/s3control/api_op_CreateAccessPoint.go b/service/s3control/api_op_CreateAccessPoint.go
index 98a636d5e43..8afd40b58a9 100644
--- a/service/s3control/api_op_CreateAccessPoint.go
+++ b/service/s3control/api_op_CreateAccessPoint.go
@@ -114,7 +114,7 @@ func (c *Client) addOperationCreateAccessPointMiddlewares(stack *middleware.Stac
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -186,7 +186,7 @@ func (c *Client) addOperationCreateAccessPointMiddlewares(stack *middleware.Stac
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -354,8 +354,6 @@ func (m *opCreateAccessPointResolveEndpointMiddleware) HandleSerialize(ctx conte
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -420,6 +418,8 @@ func (m *opCreateAccessPointResolveEndpointMiddleware) HandleSerialize(ctx conte
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_CreateAccessPointForObjectLambda.go b/service/s3control/api_op_CreateAccessPointForObjectLambda.go
index eb9fb87d808..d4abaad8029 100644
--- a/service/s3control/api_op_CreateAccessPointForObjectLambda.go
+++ b/service/s3control/api_op_CreateAccessPointForObjectLambda.go
@@ -86,7 +86,7 @@ func (c *Client) addOperationCreateAccessPointForObjectLambdaMiddlewares(stack *
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -158,7 +158,7 @@ func (c *Client) addOperationCreateAccessPointForObjectLambdaMiddlewares(stack *
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -300,8 +300,6 @@ func (m *opCreateAccessPointForObjectLambdaResolveEndpointMiddleware) HandleSeri
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -366,6 +364,8 @@ func (m *opCreateAccessPointForObjectLambdaResolveEndpointMiddleware) HandleSeri
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_CreateBucket.go b/service/s3control/api_op_CreateBucket.go
index 45bb552029e..346bb53dfc9 100644
--- a/service/s3control/api_op_CreateBucket.go
+++ b/service/s3control/api_op_CreateBucket.go
@@ -132,7 +132,7 @@ func (c *Client) addOperationCreateBucketMiddlewares(stack *middleware.Stack, op
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -204,7 +204,7 @@ func (c *Client) addOperationCreateBucketMiddlewares(stack *middleware.Stack, op
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -317,8 +317,6 @@ func (m *opCreateBucketResolveEndpointMiddleware) HandleSerialize(ctx context.Co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3control/api_op_CreateJob.go b/service/s3control/api_op_CreateJob.go
index 69a24fb640e..40f77c64249 100644
--- a/service/s3control/api_op_CreateJob.go
+++ b/service/s3control/api_op_CreateJob.go
@@ -125,7 +125,7 @@ func (c *Client) addOperationCreateJobMiddlewares(stack *middleware.Stack, optio
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -200,7 +200,7 @@ func (c *Client) addOperationCreateJobMiddlewares(stack *middleware.Stack, optio
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -375,8 +375,6 @@ func (m *opCreateJobResolveEndpointMiddleware) HandleSerialize(ctx context.Conte
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -441,6 +439,8 @@ func (m *opCreateJobResolveEndpointMiddleware) HandleSerialize(ctx context.Conte
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_CreateMultiRegionAccessPoint.go b/service/s3control/api_op_CreateMultiRegionAccessPoint.go
index 8b742f25f58..ef295a30da7 100644
--- a/service/s3control/api_op_CreateMultiRegionAccessPoint.go
+++ b/service/s3control/api_op_CreateMultiRegionAccessPoint.go
@@ -95,7 +95,7 @@ func (c *Client) addOperationCreateMultiRegionAccessPointMiddlewares(stack *midd
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -173,7 +173,7 @@ func (c *Client) addOperationCreateMultiRegionAccessPointMiddlewares(stack *midd
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -348,8 +348,6 @@ func (m *opCreateMultiRegionAccessPointResolveEndpointMiddleware) HandleSerializ
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -414,6 +412,8 @@ func (m *opCreateMultiRegionAccessPointResolveEndpointMiddleware) HandleSerializ
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_DeleteAccessPoint.go b/service/s3control/api_op_DeleteAccessPoint.go
index af2b5b377e5..7f38295aa1c 100644
--- a/service/s3control/api_op_DeleteAccessPoint.go
+++ b/service/s3control/api_op_DeleteAccessPoint.go
@@ -84,7 +84,7 @@ func (c *Client) addOperationDeleteAccessPointMiddlewares(stack *middleware.Stac
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -156,7 +156,7 @@ func (c *Client) addOperationDeleteAccessPointMiddlewares(stack *middleware.Stac
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -324,8 +324,6 @@ func (m *opDeleteAccessPointResolveEndpointMiddleware) HandleSerialize(ctx conte
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -390,6 +388,8 @@ func (m *opDeleteAccessPointResolveEndpointMiddleware) HandleSerialize(ctx conte
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_DeleteAccessPointForObjectLambda.go b/service/s3control/api_op_DeleteAccessPointForObjectLambda.go
index ebc37830885..9bda0aa903c 100644
--- a/service/s3control/api_op_DeleteAccessPointForObjectLambda.go
+++ b/service/s3control/api_op_DeleteAccessPointForObjectLambda.go
@@ -71,7 +71,7 @@ func (c *Client) addOperationDeleteAccessPointForObjectLambdaMiddlewares(stack *
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -143,7 +143,7 @@ func (c *Client) addOperationDeleteAccessPointForObjectLambdaMiddlewares(stack *
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -285,8 +285,6 @@ func (m *opDeleteAccessPointForObjectLambdaResolveEndpointMiddleware) HandleSeri
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -351,6 +349,8 @@ func (m *opDeleteAccessPointForObjectLambdaResolveEndpointMiddleware) HandleSeri
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_DeleteAccessPointPolicy.go b/service/s3control/api_op_DeleteAccessPointPolicy.go
index 8300be71842..b2cb535651e 100644
--- a/service/s3control/api_op_DeleteAccessPointPolicy.go
+++ b/service/s3control/api_op_DeleteAccessPointPolicy.go
@@ -84,7 +84,7 @@ func (c *Client) addOperationDeleteAccessPointPolicyMiddlewares(stack *middlewar
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -156,7 +156,7 @@ func (c *Client) addOperationDeleteAccessPointPolicyMiddlewares(stack *middlewar
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -324,8 +324,6 @@ func (m *opDeleteAccessPointPolicyResolveEndpointMiddleware) HandleSerialize(ctx
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -390,6 +388,8 @@ func (m *opDeleteAccessPointPolicyResolveEndpointMiddleware) HandleSerialize(ctx
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_DeleteAccessPointPolicyForObjectLambda.go b/service/s3control/api_op_DeleteAccessPointPolicyForObjectLambda.go
index 74d134ee08a..23e9ba3b2c3 100644
--- a/service/s3control/api_op_DeleteAccessPointPolicyForObjectLambda.go
+++ b/service/s3control/api_op_DeleteAccessPointPolicyForObjectLambda.go
@@ -70,7 +70,7 @@ func (c *Client) addOperationDeleteAccessPointPolicyForObjectLambdaMiddlewares(s
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -142,7 +142,7 @@ func (c *Client) addOperationDeleteAccessPointPolicyForObjectLambdaMiddlewares(s
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -284,8 +284,6 @@ func (m *opDeleteAccessPointPolicyForObjectLambdaResolveEndpointMiddleware) Hand
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -350,6 +348,8 @@ func (m *opDeleteAccessPointPolicyForObjectLambdaResolveEndpointMiddleware) Hand
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_DeleteBucket.go b/service/s3control/api_op_DeleteBucket.go
index a84bae1406a..e484dfc12ab 100644
--- a/service/s3control/api_op_DeleteBucket.go
+++ b/service/s3control/api_op_DeleteBucket.go
@@ -89,7 +89,7 @@ func (c *Client) addOperationDeleteBucketMiddlewares(stack *middleware.Stack, op
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -161,7 +161,7 @@ func (c *Client) addOperationDeleteBucketMiddlewares(stack *middleware.Stack, op
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -329,8 +329,6 @@ func (m *opDeleteBucketResolveEndpointMiddleware) HandleSerialize(ctx context.Co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -395,6 +393,8 @@ func (m *opDeleteBucketResolveEndpointMiddleware) HandleSerialize(ctx context.Co
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_DeleteBucketLifecycleConfiguration.go b/service/s3control/api_op_DeleteBucketLifecycleConfiguration.go
index aeec7cb8497..e0713ecd6e1 100644
--- a/service/s3control/api_op_DeleteBucketLifecycleConfiguration.go
+++ b/service/s3control/api_op_DeleteBucketLifecycleConfiguration.go
@@ -95,7 +95,7 @@ func (c *Client) addOperationDeleteBucketLifecycleConfigurationMiddlewares(stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -167,7 +167,7 @@ func (c *Client) addOperationDeleteBucketLifecycleConfigurationMiddlewares(stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -335,8 +335,6 @@ func (m *opDeleteBucketLifecycleConfigurationResolveEndpointMiddleware) HandleSe
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -401,6 +399,8 @@ func (m *opDeleteBucketLifecycleConfigurationResolveEndpointMiddleware) HandleSe
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_DeleteBucketPolicy.go b/service/s3control/api_op_DeleteBucketPolicy.go
index 55226a992e6..c2bf04a716e 100644
--- a/service/s3control/api_op_DeleteBucketPolicy.go
+++ b/service/s3control/api_op_DeleteBucketPolicy.go
@@ -99,7 +99,7 @@ func (c *Client) addOperationDeleteBucketPolicyMiddlewares(stack *middleware.Sta
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -171,7 +171,7 @@ func (c *Client) addOperationDeleteBucketPolicyMiddlewares(stack *middleware.Sta
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -339,8 +339,6 @@ func (m *opDeleteBucketPolicyResolveEndpointMiddleware) HandleSerialize(ctx cont
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -405,6 +403,8 @@ func (m *opDeleteBucketPolicyResolveEndpointMiddleware) HandleSerialize(ctx cont
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_DeleteBucketReplication.go b/service/s3control/api_op_DeleteBucketReplication.go
index c615431cb04..411969e52a2 100644
--- a/service/s3control/api_op_DeleteBucketReplication.go
+++ b/service/s3control/api_op_DeleteBucketReplication.go
@@ -102,7 +102,7 @@ func (c *Client) addOperationDeleteBucketReplicationMiddlewares(stack *middlewar
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -174,7 +174,7 @@ func (c *Client) addOperationDeleteBucketReplicationMiddlewares(stack *middlewar
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -342,8 +342,6 @@ func (m *opDeleteBucketReplicationResolveEndpointMiddleware) HandleSerialize(ctx
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -408,6 +406,8 @@ func (m *opDeleteBucketReplicationResolveEndpointMiddleware) HandleSerialize(ctx
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_DeleteBucketTagging.go b/service/s3control/api_op_DeleteBucketTagging.go
index dab7c45cbfb..de6f24d4301 100644
--- a/service/s3control/api_op_DeleteBucketTagging.go
+++ b/service/s3control/api_op_DeleteBucketTagging.go
@@ -88,7 +88,7 @@ func (c *Client) addOperationDeleteBucketTaggingMiddlewares(stack *middleware.St
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -160,7 +160,7 @@ func (c *Client) addOperationDeleteBucketTaggingMiddlewares(stack *middleware.St
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -328,8 +328,6 @@ func (m *opDeleteBucketTaggingResolveEndpointMiddleware) HandleSerialize(ctx con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -394,6 +392,8 @@ func (m *opDeleteBucketTaggingResolveEndpointMiddleware) HandleSerialize(ctx con
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_DeleteJobTagging.go b/service/s3control/api_op_DeleteJobTagging.go
index 41c1fc1bd3a..448fe58fd74 100644
--- a/service/s3control/api_op_DeleteJobTagging.go
+++ b/service/s3control/api_op_DeleteJobTagging.go
@@ -73,7 +73,7 @@ func (c *Client) addOperationDeleteJobTaggingMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -145,7 +145,7 @@ func (c *Client) addOperationDeleteJobTaggingMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -287,8 +287,6 @@ func (m *opDeleteJobTaggingResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -353,6 +351,8 @@ func (m *opDeleteJobTaggingResolveEndpointMiddleware) HandleSerialize(ctx contex
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_DeleteMultiRegionAccessPoint.go b/service/s3control/api_op_DeleteMultiRegionAccessPoint.go
index 001cd03822e..6919f274814 100644
--- a/service/s3control/api_op_DeleteMultiRegionAccessPoint.go
+++ b/service/s3control/api_op_DeleteMultiRegionAccessPoint.go
@@ -93,7 +93,7 @@ func (c *Client) addOperationDeleteMultiRegionAccessPointMiddlewares(stack *midd
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -171,7 +171,7 @@ func (c *Client) addOperationDeleteMultiRegionAccessPointMiddlewares(stack *midd
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -346,8 +346,6 @@ func (m *opDeleteMultiRegionAccessPointResolveEndpointMiddleware) HandleSerializ
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -412,6 +410,8 @@ func (m *opDeleteMultiRegionAccessPointResolveEndpointMiddleware) HandleSerializ
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_DeletePublicAccessBlock.go b/service/s3control/api_op_DeletePublicAccessBlock.go
index ecbf2747bc4..bcfee7a7e1a 100644
--- a/service/s3control/api_op_DeletePublicAccessBlock.go
+++ b/service/s3control/api_op_DeletePublicAccessBlock.go
@@ -66,7 +66,7 @@ func (c *Client) addOperationDeletePublicAccessBlockMiddlewares(stack *middlewar
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -138,7 +138,7 @@ func (c *Client) addOperationDeletePublicAccessBlockMiddlewares(stack *middlewar
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -280,8 +280,6 @@ func (m *opDeletePublicAccessBlockResolveEndpointMiddleware) HandleSerialize(ctx
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -346,6 +344,8 @@ func (m *opDeletePublicAccessBlockResolveEndpointMiddleware) HandleSerialize(ctx
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_DeleteStorageLensConfiguration.go b/service/s3control/api_op_DeleteStorageLensConfiguration.go
index f0b164ba1cf..51064c686d9 100644
--- a/service/s3control/api_op_DeleteStorageLensConfiguration.go
+++ b/service/s3control/api_op_DeleteStorageLensConfiguration.go
@@ -72,7 +72,7 @@ func (c *Client) addOperationDeleteStorageLensConfigurationMiddlewares(stack *mi
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -144,7 +144,7 @@ func (c *Client) addOperationDeleteStorageLensConfigurationMiddlewares(stack *mi
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -286,8 +286,6 @@ func (m *opDeleteStorageLensConfigurationResolveEndpointMiddleware) HandleSerial
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -352,6 +350,8 @@ func (m *opDeleteStorageLensConfigurationResolveEndpointMiddleware) HandleSerial
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_DeleteStorageLensConfigurationTagging.go b/service/s3control/api_op_DeleteStorageLensConfigurationTagging.go
index 79facd3c0dd..67f252a1365 100644
--- a/service/s3control/api_op_DeleteStorageLensConfigurationTagging.go
+++ b/service/s3control/api_op_DeleteStorageLensConfigurationTagging.go
@@ -72,7 +72,7 @@ func (c *Client) addOperationDeleteStorageLensConfigurationTaggingMiddlewares(st
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -144,7 +144,7 @@ func (c *Client) addOperationDeleteStorageLensConfigurationTaggingMiddlewares(st
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -286,8 +286,6 @@ func (m *opDeleteStorageLensConfigurationTaggingResolveEndpointMiddleware) Handl
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -352,6 +350,8 @@ func (m *opDeleteStorageLensConfigurationTaggingResolveEndpointMiddleware) Handl
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_DescribeJob.go b/service/s3control/api_op_DescribeJob.go
index c50011c9b6d..b638b146055 100644
--- a/service/s3control/api_op_DescribeJob.go
+++ b/service/s3control/api_op_DescribeJob.go
@@ -78,7 +78,7 @@ func (c *Client) addOperationDescribeJobMiddlewares(stack *middleware.Stack, opt
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -150,7 +150,7 @@ func (c *Client) addOperationDescribeJobMiddlewares(stack *middleware.Stack, opt
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -292,8 +292,6 @@ func (m *opDescribeJobResolveEndpointMiddleware) HandleSerialize(ctx context.Con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -358,6 +356,8 @@ func (m *opDescribeJobResolveEndpointMiddleware) HandleSerialize(ctx context.Con
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_DescribeMultiRegionAccessPointOperation.go b/service/s3control/api_op_DescribeMultiRegionAccessPointOperation.go
index 210932903b2..065b121f499 100644
--- a/service/s3control/api_op_DescribeMultiRegionAccessPointOperation.go
+++ b/service/s3control/api_op_DescribeMultiRegionAccessPointOperation.go
@@ -83,7 +83,7 @@ func (c *Client) addOperationDescribeMultiRegionAccessPointOperationMiddlewares(
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -158,7 +158,7 @@ func (c *Client) addOperationDescribeMultiRegionAccessPointOperationMiddlewares(
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -300,8 +300,6 @@ func (m *opDescribeMultiRegionAccessPointOperationResolveEndpointMiddleware) Han
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -366,6 +364,8 @@ func (m *opDescribeMultiRegionAccessPointOperationResolveEndpointMiddleware) Han
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetAccessPoint.go b/service/s3control/api_op_GetAccessPoint.go
index 5cb605dcf79..d27fbf5678e 100644
--- a/service/s3control/api_op_GetAccessPoint.go
+++ b/service/s3control/api_op_GetAccessPoint.go
@@ -132,7 +132,7 @@ func (c *Client) addOperationGetAccessPointMiddlewares(stack *middleware.Stack,
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -204,7 +204,7 @@ func (c *Client) addOperationGetAccessPointMiddlewares(stack *middleware.Stack,
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -372,8 +372,6 @@ func (m *opGetAccessPointResolveEndpointMiddleware) HandleSerialize(ctx context.
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -438,6 +436,8 @@ func (m *opGetAccessPointResolveEndpointMiddleware) HandleSerialize(ctx context.
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetAccessPointConfigurationForObjectLambda.go b/service/s3control/api_op_GetAccessPointConfigurationForObjectLambda.go
index b7d1d2d6fdd..abbdd00eee3 100644
--- a/service/s3control/api_op_GetAccessPointConfigurationForObjectLambda.go
+++ b/service/s3control/api_op_GetAccessPointConfigurationForObjectLambda.go
@@ -75,7 +75,7 @@ func (c *Client) addOperationGetAccessPointConfigurationForObjectLambdaMiddlewar
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -147,7 +147,7 @@ func (c *Client) addOperationGetAccessPointConfigurationForObjectLambdaMiddlewar
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -289,8 +289,6 @@ func (m *opGetAccessPointConfigurationForObjectLambdaResolveEndpointMiddleware)
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -355,6 +353,8 @@ func (m *opGetAccessPointConfigurationForObjectLambdaResolveEndpointMiddleware)
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetAccessPointForObjectLambda.go b/service/s3control/api_op_GetAccessPointForObjectLambda.go
index 96060b0c6e9..9abcdb35208 100644
--- a/service/s3control/api_op_GetAccessPointForObjectLambda.go
+++ b/service/s3control/api_op_GetAccessPointForObjectLambda.go
@@ -87,7 +87,7 @@ func (c *Client) addOperationGetAccessPointForObjectLambdaMiddlewares(stack *mid
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -159,7 +159,7 @@ func (c *Client) addOperationGetAccessPointForObjectLambdaMiddlewares(stack *mid
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -301,8 +301,6 @@ func (m *opGetAccessPointForObjectLambdaResolveEndpointMiddleware) HandleSeriali
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -367,6 +365,8 @@ func (m *opGetAccessPointForObjectLambdaResolveEndpointMiddleware) HandleSeriali
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetAccessPointPolicy.go b/service/s3control/api_op_GetAccessPointPolicy.go
index bb8ad41e732..c99ddceaecf 100644
--- a/service/s3control/api_op_GetAccessPointPolicy.go
+++ b/service/s3control/api_op_GetAccessPointPolicy.go
@@ -82,7 +82,7 @@ func (c *Client) addOperationGetAccessPointPolicyMiddlewares(stack *middleware.S
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -154,7 +154,7 @@ func (c *Client) addOperationGetAccessPointPolicyMiddlewares(stack *middleware.S
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -322,8 +322,6 @@ func (m *opGetAccessPointPolicyResolveEndpointMiddleware) HandleSerialize(ctx co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -388,6 +386,8 @@ func (m *opGetAccessPointPolicyResolveEndpointMiddleware) HandleSerialize(ctx co
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetAccessPointPolicyForObjectLambda.go b/service/s3control/api_op_GetAccessPointPolicyForObjectLambda.go
index 796235eab9d..ecaa1bd83df 100644
--- a/service/s3control/api_op_GetAccessPointPolicyForObjectLambda.go
+++ b/service/s3control/api_op_GetAccessPointPolicyForObjectLambda.go
@@ -74,7 +74,7 @@ func (c *Client) addOperationGetAccessPointPolicyForObjectLambdaMiddlewares(stac
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -146,7 +146,7 @@ func (c *Client) addOperationGetAccessPointPolicyForObjectLambdaMiddlewares(stac
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -288,8 +288,6 @@ func (m *opGetAccessPointPolicyForObjectLambdaResolveEndpointMiddleware) HandleS
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -354,6 +352,8 @@ func (m *opGetAccessPointPolicyForObjectLambdaResolveEndpointMiddleware) HandleS
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetAccessPointPolicyStatus.go b/service/s3control/api_op_GetAccessPointPolicyStatus.go
index 7afe3d929ef..224f422fb23 100644
--- a/service/s3control/api_op_GetAccessPointPolicyStatus.go
+++ b/service/s3control/api_op_GetAccessPointPolicyStatus.go
@@ -74,7 +74,7 @@ func (c *Client) addOperationGetAccessPointPolicyStatusMiddlewares(stack *middle
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -146,7 +146,7 @@ func (c *Client) addOperationGetAccessPointPolicyStatusMiddlewares(stack *middle
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -290,8 +290,6 @@ func (m *opGetAccessPointPolicyStatusResolveEndpointMiddleware) HandleSerialize(
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -356,6 +354,8 @@ func (m *opGetAccessPointPolicyStatusResolveEndpointMiddleware) HandleSerialize(
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetAccessPointPolicyStatusForObjectLambda.go b/service/s3control/api_op_GetAccessPointPolicyStatusForObjectLambda.go
index 0124929fc25..c1c6de967e1 100644
--- a/service/s3control/api_op_GetAccessPointPolicyStatusForObjectLambda.go
+++ b/service/s3control/api_op_GetAccessPointPolicyStatusForObjectLambda.go
@@ -76,7 +76,7 @@ func (c *Client) addOperationGetAccessPointPolicyStatusForObjectLambdaMiddleware
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -148,7 +148,7 @@ func (c *Client) addOperationGetAccessPointPolicyStatusForObjectLambdaMiddleware
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -290,8 +290,6 @@ func (m *opGetAccessPointPolicyStatusForObjectLambdaResolveEndpointMiddleware) H
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -356,6 +354,8 @@ func (m *opGetAccessPointPolicyStatusForObjectLambdaResolveEndpointMiddleware) H
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetBucket.go b/service/s3control/api_op_GetBucket.go
index ef8317bb978..4e080f4596f 100644
--- a/service/s3control/api_op_GetBucket.go
+++ b/service/s3control/api_op_GetBucket.go
@@ -105,7 +105,7 @@ func (c *Client) addOperationGetBucketMiddlewares(stack *middleware.Stack, optio
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -177,7 +177,7 @@ func (c *Client) addOperationGetBucketMiddlewares(stack *middleware.Stack, optio
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -345,8 +345,6 @@ func (m *opGetBucketResolveEndpointMiddleware) HandleSerialize(ctx context.Conte
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -411,6 +409,8 @@ func (m *opGetBucketResolveEndpointMiddleware) HandleSerialize(ctx context.Conte
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetBucketLifecycleConfiguration.go b/service/s3control/api_op_GetBucketLifecycleConfiguration.go
index c5d5bea36f1..8e936cbaa58 100644
--- a/service/s3control/api_op_GetBucketLifecycleConfiguration.go
+++ b/service/s3control/api_op_GetBucketLifecycleConfiguration.go
@@ -106,7 +106,7 @@ func (c *Client) addOperationGetBucketLifecycleConfigurationMiddlewares(stack *m
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -178,7 +178,7 @@ func (c *Client) addOperationGetBucketLifecycleConfigurationMiddlewares(stack *m
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -346,8 +346,6 @@ func (m *opGetBucketLifecycleConfigurationResolveEndpointMiddleware) HandleSeria
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -412,6 +410,8 @@ func (m *opGetBucketLifecycleConfigurationResolveEndpointMiddleware) HandleSeria
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetBucketPolicy.go b/service/s3control/api_op_GetBucketPolicy.go
index 2b71f35931b..6c5782e5e4f 100644
--- a/service/s3control/api_op_GetBucketPolicy.go
+++ b/service/s3control/api_op_GetBucketPolicy.go
@@ -103,7 +103,7 @@ func (c *Client) addOperationGetBucketPolicyMiddlewares(stack *middleware.Stack,
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -175,7 +175,7 @@ func (c *Client) addOperationGetBucketPolicyMiddlewares(stack *middleware.Stack,
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -343,8 +343,6 @@ func (m *opGetBucketPolicyResolveEndpointMiddleware) HandleSerialize(ctx context
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -409,6 +407,8 @@ func (m *opGetBucketPolicyResolveEndpointMiddleware) HandleSerialize(ctx context
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetBucketReplication.go b/service/s3control/api_op_GetBucketReplication.go
index 330685255be..97b31183faf 100644
--- a/service/s3control/api_op_GetBucketReplication.go
+++ b/service/s3control/api_op_GetBucketReplication.go
@@ -112,7 +112,7 @@ func (c *Client) addOperationGetBucketReplicationMiddlewares(stack *middleware.S
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -184,7 +184,7 @@ func (c *Client) addOperationGetBucketReplicationMiddlewares(stack *middleware.S
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -352,8 +352,6 @@ func (m *opGetBucketReplicationResolveEndpointMiddleware) HandleSerialize(ctx co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -418,6 +416,8 @@ func (m *opGetBucketReplicationResolveEndpointMiddleware) HandleSerialize(ctx co
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetBucketTagging.go b/service/s3control/api_op_GetBucketTagging.go
index 7d99e79f80d..0e62c41d9c4 100644
--- a/service/s3control/api_op_GetBucketTagging.go
+++ b/service/s3control/api_op_GetBucketTagging.go
@@ -100,7 +100,7 @@ func (c *Client) addOperationGetBucketTaggingMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -172,7 +172,7 @@ func (c *Client) addOperationGetBucketTaggingMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -340,8 +340,6 @@ func (m *opGetBucketTaggingResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -406,6 +404,8 @@ func (m *opGetBucketTaggingResolveEndpointMiddleware) HandleSerialize(ctx contex
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetBucketVersioning.go b/service/s3control/api_op_GetBucketVersioning.go
index 9bbd8d87825..09b318e0ce2 100644
--- a/service/s3control/api_op_GetBucketVersioning.go
+++ b/service/s3control/api_op_GetBucketVersioning.go
@@ -95,7 +95,7 @@ func (c *Client) addOperationGetBucketVersioningMiddlewares(stack *middleware.St
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -167,7 +167,7 @@ func (c *Client) addOperationGetBucketVersioningMiddlewares(stack *middleware.St
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -335,8 +335,6 @@ func (m *opGetBucketVersioningResolveEndpointMiddleware) HandleSerialize(ctx con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -401,6 +399,8 @@ func (m *opGetBucketVersioningResolveEndpointMiddleware) HandleSerialize(ctx con
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetJobTagging.go b/service/s3control/api_op_GetJobTagging.go
index 27d7a1a8764..a193320d090 100644
--- a/service/s3control/api_op_GetJobTagging.go
+++ b/service/s3control/api_op_GetJobTagging.go
@@ -77,7 +77,7 @@ func (c *Client) addOperationGetJobTaggingMiddlewares(stack *middleware.Stack, o
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -149,7 +149,7 @@ func (c *Client) addOperationGetJobTaggingMiddlewares(stack *middleware.Stack, o
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -291,8 +291,6 @@ func (m *opGetJobTaggingResolveEndpointMiddleware) HandleSerialize(ctx context.C
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -357,6 +355,8 @@ func (m *opGetJobTaggingResolveEndpointMiddleware) HandleSerialize(ctx context.C
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetMultiRegionAccessPoint.go b/service/s3control/api_op_GetMultiRegionAccessPoint.go
index 18a14e8852c..5e4397f95b8 100644
--- a/service/s3control/api_op_GetMultiRegionAccessPoint.go
+++ b/service/s3control/api_op_GetMultiRegionAccessPoint.go
@@ -86,7 +86,7 @@ func (c *Client) addOperationGetMultiRegionAccessPointMiddlewares(stack *middlew
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -161,7 +161,7 @@ func (c *Client) addOperationGetMultiRegionAccessPointMiddlewares(stack *middlew
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -303,8 +303,6 @@ func (m *opGetMultiRegionAccessPointResolveEndpointMiddleware) HandleSerialize(c
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -369,6 +367,8 @@ func (m *opGetMultiRegionAccessPointResolveEndpointMiddleware) HandleSerialize(c
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetMultiRegionAccessPointPolicy.go b/service/s3control/api_op_GetMultiRegionAccessPointPolicy.go
index cc22218871f..cf1d022be2d 100644
--- a/service/s3control/api_op_GetMultiRegionAccessPointPolicy.go
+++ b/service/s3control/api_op_GetMultiRegionAccessPointPolicy.go
@@ -83,7 +83,7 @@ func (c *Client) addOperationGetMultiRegionAccessPointPolicyMiddlewares(stack *m
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -158,7 +158,7 @@ func (c *Client) addOperationGetMultiRegionAccessPointPolicyMiddlewares(stack *m
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -300,8 +300,6 @@ func (m *opGetMultiRegionAccessPointPolicyResolveEndpointMiddleware) HandleSeria
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -366,6 +364,8 @@ func (m *opGetMultiRegionAccessPointPolicyResolveEndpointMiddleware) HandleSeria
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetMultiRegionAccessPointPolicyStatus.go b/service/s3control/api_op_GetMultiRegionAccessPointPolicyStatus.go
index 401a5241446..c8954f40803 100644
--- a/service/s3control/api_op_GetMultiRegionAccessPointPolicyStatus.go
+++ b/service/s3control/api_op_GetMultiRegionAccessPointPolicyStatus.go
@@ -86,7 +86,7 @@ func (c *Client) addOperationGetMultiRegionAccessPointPolicyStatusMiddlewares(st
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -161,7 +161,7 @@ func (c *Client) addOperationGetMultiRegionAccessPointPolicyStatusMiddlewares(st
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -303,8 +303,6 @@ func (m *opGetMultiRegionAccessPointPolicyStatusResolveEndpointMiddleware) Handl
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -369,6 +367,8 @@ func (m *opGetMultiRegionAccessPointPolicyStatusResolveEndpointMiddleware) Handl
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetMultiRegionAccessPointRoutes.go b/service/s3control/api_op_GetMultiRegionAccessPointRoutes.go
index 43f1bffd0cb..233d38608dd 100644
--- a/service/s3control/api_op_GetMultiRegionAccessPointRoutes.go
+++ b/service/s3control/api_op_GetMultiRegionAccessPointRoutes.go
@@ -86,7 +86,7 @@ func (c *Client) addOperationGetMultiRegionAccessPointRoutesMiddlewares(stack *m
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -161,7 +161,7 @@ func (c *Client) addOperationGetMultiRegionAccessPointRoutesMiddlewares(stack *m
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -303,8 +303,6 @@ func (m *opGetMultiRegionAccessPointRoutesResolveEndpointMiddleware) HandleSeria
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -369,6 +367,8 @@ func (m *opGetMultiRegionAccessPointRoutesResolveEndpointMiddleware) HandleSeria
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetPublicAccessBlock.go b/service/s3control/api_op_GetPublicAccessBlock.go
index 5dfb323b77f..9ebd8aef5ed 100644
--- a/service/s3control/api_op_GetPublicAccessBlock.go
+++ b/service/s3control/api_op_GetPublicAccessBlock.go
@@ -72,7 +72,7 @@ func (c *Client) addOperationGetPublicAccessBlockMiddlewares(stack *middleware.S
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -144,7 +144,7 @@ func (c *Client) addOperationGetPublicAccessBlockMiddlewares(stack *middleware.S
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -286,8 +286,6 @@ func (m *opGetPublicAccessBlockResolveEndpointMiddleware) HandleSerialize(ctx co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -352,6 +350,8 @@ func (m *opGetPublicAccessBlockResolveEndpointMiddleware) HandleSerialize(ctx co
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetStorageLensConfiguration.go b/service/s3control/api_op_GetStorageLensConfiguration.go
index fabca30fb1f..db117d63719 100644
--- a/service/s3control/api_op_GetStorageLensConfiguration.go
+++ b/service/s3control/api_op_GetStorageLensConfiguration.go
@@ -78,7 +78,7 @@ func (c *Client) addOperationGetStorageLensConfigurationMiddlewares(stack *middl
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -150,7 +150,7 @@ func (c *Client) addOperationGetStorageLensConfigurationMiddlewares(stack *middl
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -292,8 +292,6 @@ func (m *opGetStorageLensConfigurationResolveEndpointMiddleware) HandleSerialize
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -358,6 +356,8 @@ func (m *opGetStorageLensConfigurationResolveEndpointMiddleware) HandleSerialize
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_GetStorageLensConfigurationTagging.go b/service/s3control/api_op_GetStorageLensConfigurationTagging.go
index 64f3a4a9e57..f661e3013d8 100644
--- a/service/s3control/api_op_GetStorageLensConfigurationTagging.go
+++ b/service/s3control/api_op_GetStorageLensConfigurationTagging.go
@@ -77,7 +77,7 @@ func (c *Client) addOperationGetStorageLensConfigurationTaggingMiddlewares(stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -149,7 +149,7 @@ func (c *Client) addOperationGetStorageLensConfigurationTaggingMiddlewares(stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -291,8 +291,6 @@ func (m *opGetStorageLensConfigurationTaggingResolveEndpointMiddleware) HandleSe
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -357,6 +355,8 @@ func (m *opGetStorageLensConfigurationTaggingResolveEndpointMiddleware) HandleSe
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_ListAccessPoints.go b/service/s3control/api_op_ListAccessPoints.go
index da13b9d9a90..a02faa9b2f8 100644
--- a/service/s3control/api_op_ListAccessPoints.go
+++ b/service/s3control/api_op_ListAccessPoints.go
@@ -109,7 +109,7 @@ func (c *Client) addOperationListAccessPointsMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -181,7 +181,7 @@ func (c *Client) addOperationListAccessPointsMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -438,8 +438,6 @@ func (m *opListAccessPointsResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -504,6 +502,8 @@ func (m *opListAccessPointsResolveEndpointMiddleware) HandleSerialize(ctx contex
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_ListAccessPointsForObjectLambda.go b/service/s3control/api_op_ListAccessPointsForObjectLambda.go
index 0a1b1c728f1..71ae8372f7b 100644
--- a/service/s3control/api_op_ListAccessPointsForObjectLambda.go
+++ b/service/s3control/api_op_ListAccessPointsForObjectLambda.go
@@ -91,7 +91,7 @@ func (c *Client) addOperationListAccessPointsForObjectLambdaMiddlewares(stack *m
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -163,7 +163,7 @@ func (c *Client) addOperationListAccessPointsForObjectLambdaMiddlewares(stack *m
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -398,8 +398,6 @@ func (m *opListAccessPointsForObjectLambdaResolveEndpointMiddleware) HandleSeria
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -464,6 +462,8 @@ func (m *opListAccessPointsForObjectLambdaResolveEndpointMiddleware) HandleSeria
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_ListJobs.go b/service/s3control/api_op_ListJobs.go
index d8cad704d29..0b33bec8b01 100644
--- a/service/s3control/api_op_ListJobs.go
+++ b/service/s3control/api_op_ListJobs.go
@@ -93,7 +93,7 @@ func (c *Client) addOperationListJobsMiddlewares(stack *middleware.Stack, option
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -165,7 +165,7 @@ func (c *Client) addOperationListJobsMiddlewares(stack *middleware.Stack, option
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -399,8 +399,6 @@ func (m *opListJobsResolveEndpointMiddleware) HandleSerialize(ctx context.Contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -465,6 +463,8 @@ func (m *opListJobsResolveEndpointMiddleware) HandleSerialize(ctx context.Contex
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_ListMultiRegionAccessPoints.go b/service/s3control/api_op_ListMultiRegionAccessPoints.go
index 8e3974b16e9..afbeb698118 100644
--- a/service/s3control/api_op_ListMultiRegionAccessPoints.go
+++ b/service/s3control/api_op_ListMultiRegionAccessPoints.go
@@ -91,7 +91,7 @@ func (c *Client) addOperationListMultiRegionAccessPointsMiddlewares(stack *middl
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -166,7 +166,7 @@ func (c *Client) addOperationListMultiRegionAccessPointsMiddlewares(stack *middl
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -397,8 +397,6 @@ func (m *opListMultiRegionAccessPointsResolveEndpointMiddleware) HandleSerialize
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -463,6 +461,8 @@ func (m *opListMultiRegionAccessPointsResolveEndpointMiddleware) HandleSerialize
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_ListRegionalBuckets.go b/service/s3control/api_op_ListRegionalBuckets.go
index d37f29a64cd..d6848c097c3 100644
--- a/service/s3control/api_op_ListRegionalBuckets.go
+++ b/service/s3control/api_op_ListRegionalBuckets.go
@@ -87,7 +87,7 @@ func (c *Client) addOperationListRegionalBucketsMiddlewares(stack *middleware.St
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -159,7 +159,7 @@ func (c *Client) addOperationListRegionalBucketsMiddlewares(stack *middleware.St
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -401,8 +401,6 @@ func (m *opListRegionalBucketsResolveEndpointMiddleware) HandleSerialize(ctx con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -467,6 +465,8 @@ func (m *opListRegionalBucketsResolveEndpointMiddleware) HandleSerialize(ctx con
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_ListStorageLensConfigurations.go b/service/s3control/api_op_ListStorageLensConfigurations.go
index f4c7b33931c..3105a91176d 100644
--- a/service/s3control/api_op_ListStorageLensConfigurations.go
+++ b/service/s3control/api_op_ListStorageLensConfigurations.go
@@ -80,7 +80,7 @@ func (c *Client) addOperationListStorageLensConfigurationsMiddlewares(stack *mid
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -152,7 +152,7 @@ func (c *Client) addOperationListStorageLensConfigurationsMiddlewares(stack *mid
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -375,8 +375,6 @@ func (m *opListStorageLensConfigurationsResolveEndpointMiddleware) HandleSeriali
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -441,6 +439,8 @@ func (m *opListStorageLensConfigurationsResolveEndpointMiddleware) HandleSeriali
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_PutAccessPointConfigurationForObjectLambda.go b/service/s3control/api_op_PutAccessPointConfigurationForObjectLambda.go
index 8c8a1d8cf74..794c729f1c2 100644
--- a/service/s3control/api_op_PutAccessPointConfigurationForObjectLambda.go
+++ b/service/s3control/api_op_PutAccessPointConfigurationForObjectLambda.go
@@ -75,7 +75,7 @@ func (c *Client) addOperationPutAccessPointConfigurationForObjectLambdaMiddlewar
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -147,7 +147,7 @@ func (c *Client) addOperationPutAccessPointConfigurationForObjectLambdaMiddlewar
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -289,8 +289,6 @@ func (m *opPutAccessPointConfigurationForObjectLambdaResolveEndpointMiddleware)
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -355,6 +353,8 @@ func (m *opPutAccessPointConfigurationForObjectLambdaResolveEndpointMiddleware)
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_PutAccessPointPolicy.go b/service/s3control/api_op_PutAccessPointPolicy.go
index ef8d1c83eb4..8352c975599 100644
--- a/service/s3control/api_op_PutAccessPointPolicy.go
+++ b/service/s3control/api_op_PutAccessPointPolicy.go
@@ -95,7 +95,7 @@ func (c *Client) addOperationPutAccessPointPolicyMiddlewares(stack *middleware.S
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -167,7 +167,7 @@ func (c *Client) addOperationPutAccessPointPolicyMiddlewares(stack *middleware.S
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -335,8 +335,6 @@ func (m *opPutAccessPointPolicyResolveEndpointMiddleware) HandleSerialize(ctx co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -401,6 +399,8 @@ func (m *opPutAccessPointPolicyResolveEndpointMiddleware) HandleSerialize(ctx co
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_PutAccessPointPolicyForObjectLambda.go b/service/s3control/api_op_PutAccessPointPolicyForObjectLambda.go
index cb9a28d01e9..bdf1403b076 100644
--- a/service/s3control/api_op_PutAccessPointPolicyForObjectLambda.go
+++ b/service/s3control/api_op_PutAccessPointPolicyForObjectLambda.go
@@ -77,7 +77,7 @@ func (c *Client) addOperationPutAccessPointPolicyForObjectLambdaMiddlewares(stac
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -149,7 +149,7 @@ func (c *Client) addOperationPutAccessPointPolicyForObjectLambdaMiddlewares(stac
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -291,8 +291,6 @@ func (m *opPutAccessPointPolicyForObjectLambdaResolveEndpointMiddleware) HandleS
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -357,6 +355,8 @@ func (m *opPutAccessPointPolicyForObjectLambdaResolveEndpointMiddleware) HandleS
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_PutBucketLifecycleConfiguration.go b/service/s3control/api_op_PutBucketLifecycleConfiguration.go
index 9d442454299..c558e0ff05e 100644
--- a/service/s3control/api_op_PutBucketLifecycleConfiguration.go
+++ b/service/s3control/api_op_PutBucketLifecycleConfiguration.go
@@ -85,7 +85,7 @@ func (c *Client) addOperationPutBucketLifecycleConfigurationMiddlewares(stack *m
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -160,7 +160,7 @@ func (c *Client) addOperationPutBucketLifecycleConfigurationMiddlewares(stack *m
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -328,8 +328,6 @@ func (m *opPutBucketLifecycleConfigurationResolveEndpointMiddleware) HandleSeria
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -394,6 +392,8 @@ func (m *opPutBucketLifecycleConfigurationResolveEndpointMiddleware) HandleSeria
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_PutBucketPolicy.go b/service/s3control/api_op_PutBucketPolicy.go
index aac46b9334e..70239611ba0 100644
--- a/service/s3control/api_op_PutBucketPolicy.go
+++ b/service/s3control/api_op_PutBucketPolicy.go
@@ -108,7 +108,7 @@ func (c *Client) addOperationPutBucketPolicyMiddlewares(stack *middleware.Stack,
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -183,7 +183,7 @@ func (c *Client) addOperationPutBucketPolicyMiddlewares(stack *middleware.Stack,
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -351,8 +351,6 @@ func (m *opPutBucketPolicyResolveEndpointMiddleware) HandleSerialize(ctx context
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -417,6 +415,8 @@ func (m *opPutBucketPolicyResolveEndpointMiddleware) HandleSerialize(ctx context
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_PutBucketReplication.go b/service/s3control/api_op_PutBucketReplication.go
index bfaaa823889..3340d0ce575 100644
--- a/service/s3control/api_op_PutBucketReplication.go
+++ b/service/s3control/api_op_PutBucketReplication.go
@@ -135,7 +135,7 @@ func (c *Client) addOperationPutBucketReplicationMiddlewares(stack *middleware.S
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -210,7 +210,7 @@ func (c *Client) addOperationPutBucketReplicationMiddlewares(stack *middleware.S
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -378,8 +378,6 @@ func (m *opPutBucketReplicationResolveEndpointMiddleware) HandleSerialize(ctx co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -444,6 +442,8 @@ func (m *opPutBucketReplicationResolveEndpointMiddleware) HandleSerialize(ctx co
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_PutBucketTagging.go b/service/s3control/api_op_PutBucketTagging.go
index bfe7bbfbd8f..cfd674acfad 100644
--- a/service/s3control/api_op_PutBucketTagging.go
+++ b/service/s3control/api_op_PutBucketTagging.go
@@ -125,7 +125,7 @@ func (c *Client) addOperationPutBucketTaggingMiddlewares(stack *middleware.Stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -200,7 +200,7 @@ func (c *Client) addOperationPutBucketTaggingMiddlewares(stack *middleware.Stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -368,8 +368,6 @@ func (m *opPutBucketTaggingResolveEndpointMiddleware) HandleSerialize(ctx contex
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -434,6 +432,8 @@ func (m *opPutBucketTaggingResolveEndpointMiddleware) HandleSerialize(ctx contex
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_PutBucketVersioning.go b/service/s3control/api_op_PutBucketVersioning.go
index a5007303c66..884e5ad862b 100644
--- a/service/s3control/api_op_PutBucketVersioning.go
+++ b/service/s3control/api_op_PutBucketVersioning.go
@@ -110,7 +110,7 @@ func (c *Client) addOperationPutBucketVersioningMiddlewares(stack *middleware.St
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -185,7 +185,7 @@ func (c *Client) addOperationPutBucketVersioningMiddlewares(stack *middleware.St
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -353,8 +353,6 @@ func (m *opPutBucketVersioningResolveEndpointMiddleware) HandleSerialize(ctx con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -419,6 +417,8 @@ func (m *opPutBucketVersioningResolveEndpointMiddleware) HandleSerialize(ctx con
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_PutJobTagging.go b/service/s3control/api_op_PutJobTagging.go
index 57c7468dbcb..09271c29b32 100644
--- a/service/s3control/api_op_PutJobTagging.go
+++ b/service/s3control/api_op_PutJobTagging.go
@@ -104,7 +104,7 @@ func (c *Client) addOperationPutJobTaggingMiddlewares(stack *middleware.Stack, o
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -176,7 +176,7 @@ func (c *Client) addOperationPutJobTaggingMiddlewares(stack *middleware.Stack, o
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -318,8 +318,6 @@ func (m *opPutJobTaggingResolveEndpointMiddleware) HandleSerialize(ctx context.C
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -384,6 +382,8 @@ func (m *opPutJobTaggingResolveEndpointMiddleware) HandleSerialize(ctx context.C
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_PutMultiRegionAccessPointPolicy.go b/service/s3control/api_op_PutMultiRegionAccessPointPolicy.go
index 12693190927..06e7e078ad6 100644
--- a/service/s3control/api_op_PutMultiRegionAccessPointPolicy.go
+++ b/service/s3control/api_op_PutMultiRegionAccessPointPolicy.go
@@ -90,7 +90,7 @@ func (c *Client) addOperationPutMultiRegionAccessPointPolicyMiddlewares(stack *m
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -168,7 +168,7 @@ func (c *Client) addOperationPutMultiRegionAccessPointPolicyMiddlewares(stack *m
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -343,8 +343,6 @@ func (m *opPutMultiRegionAccessPointPolicyResolveEndpointMiddleware) HandleSeria
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -409,6 +407,8 @@ func (m *opPutMultiRegionAccessPointPolicyResolveEndpointMiddleware) HandleSeria
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_PutPublicAccessBlock.go b/service/s3control/api_op_PutPublicAccessBlock.go
index 765b8121eca..9b7a132dd19 100644
--- a/service/s3control/api_op_PutPublicAccessBlock.go
+++ b/service/s3control/api_op_PutPublicAccessBlock.go
@@ -75,7 +75,7 @@ func (c *Client) addOperationPutPublicAccessBlockMiddlewares(stack *middleware.S
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -147,7 +147,7 @@ func (c *Client) addOperationPutPublicAccessBlockMiddlewares(stack *middleware.S
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -289,8 +289,6 @@ func (m *opPutPublicAccessBlockResolveEndpointMiddleware) HandleSerialize(ctx co
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -355,6 +353,8 @@ func (m *opPutPublicAccessBlockResolveEndpointMiddleware) HandleSerialize(ctx co
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_PutStorageLensConfiguration.go b/service/s3control/api_op_PutStorageLensConfiguration.go
index 8ae5e4054ed..06cf4280df1 100644
--- a/service/s3control/api_op_PutStorageLensConfiguration.go
+++ b/service/s3control/api_op_PutStorageLensConfiguration.go
@@ -83,7 +83,7 @@ func (c *Client) addOperationPutStorageLensConfigurationMiddlewares(stack *middl
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -155,7 +155,7 @@ func (c *Client) addOperationPutStorageLensConfigurationMiddlewares(stack *middl
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -297,8 +297,6 @@ func (m *opPutStorageLensConfigurationResolveEndpointMiddleware) HandleSerialize
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -363,6 +361,8 @@ func (m *opPutStorageLensConfigurationResolveEndpointMiddleware) HandleSerialize
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_PutStorageLensConfigurationTagging.go b/service/s3control/api_op_PutStorageLensConfigurationTagging.go
index df9a6c39c8d..91042df272c 100644
--- a/service/s3control/api_op_PutStorageLensConfigurationTagging.go
+++ b/service/s3control/api_op_PutStorageLensConfigurationTagging.go
@@ -79,7 +79,7 @@ func (c *Client) addOperationPutStorageLensConfigurationTaggingMiddlewares(stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -151,7 +151,7 @@ func (c *Client) addOperationPutStorageLensConfigurationTaggingMiddlewares(stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -293,8 +293,6 @@ func (m *opPutStorageLensConfigurationTaggingResolveEndpointMiddleware) HandleSe
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -359,6 +357,8 @@ func (m *opPutStorageLensConfigurationTaggingResolveEndpointMiddleware) HandleSe
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_SubmitMultiRegionAccessPointRoutes.go b/service/s3control/api_op_SubmitMultiRegionAccessPointRoutes.go
index 00434ff836a..d8dca5d5a80 100644
--- a/service/s3control/api_op_SubmitMultiRegionAccessPointRoutes.go
+++ b/service/s3control/api_op_SubmitMultiRegionAccessPointRoutes.go
@@ -94,7 +94,7 @@ func (c *Client) addOperationSubmitMultiRegionAccessPointRoutesMiddlewares(stack
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -169,7 +169,7 @@ func (c *Client) addOperationSubmitMultiRegionAccessPointRoutesMiddlewares(stack
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -311,8 +311,6 @@ func (m *opSubmitMultiRegionAccessPointRoutesResolveEndpointMiddleware) HandleSe
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -377,6 +375,8 @@ func (m *opSubmitMultiRegionAccessPointRoutesResolveEndpointMiddleware) HandleSe
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_UpdateJobPriority.go b/service/s3control/api_op_UpdateJobPriority.go
index 314efad0289..eb7a3cf3ee2 100644
--- a/service/s3control/api_op_UpdateJobPriority.go
+++ b/service/s3control/api_op_UpdateJobPriority.go
@@ -88,7 +88,7 @@ func (c *Client) addOperationUpdateJobPriorityMiddlewares(stack *middleware.Stac
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -160,7 +160,7 @@ func (c *Client) addOperationUpdateJobPriorityMiddlewares(stack *middleware.Stac
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -302,8 +302,6 @@ func (m *opUpdateJobPriorityResolveEndpointMiddleware) HandleSerialize(ctx conte
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -368,6 +366,8 @@ func (m *opUpdateJobPriorityResolveEndpointMiddleware) HandleSerialize(ctx conte
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3control/api_op_UpdateJobStatus.go b/service/s3control/api_op_UpdateJobStatus.go
index a8b5efc1c26..ccef818b615 100644
--- a/service/s3control/api_op_UpdateJobStatus.go
+++ b/service/s3control/api_op_UpdateJobStatus.go
@@ -93,7 +93,7 @@ func (c *Client) addOperationUpdateJobStatusMiddlewares(stack *middleware.Stack,
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -165,7 +165,7 @@ func (c *Client) addOperationUpdateJobStatusMiddlewares(stack *middleware.Stack,
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -307,8 +307,6 @@ func (m *opUpdateJobStatusResolveEndpointMiddleware) HandleSerialize(ctx context
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
@@ -373,6 +371,8 @@ func (m *opUpdateJobStatusResolveEndpointMiddleware) HandleSerialize(ctx context
 		}
 	}
 
+	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
+
 	return next.HandleSerialize(ctx, in)
 }
 
diff --git a/service/s3outposts/api_client.go b/service/s3outposts/api_client.go
index 3bfcf53ac52..64c801e66c2 100644
--- a/service/s3outposts/api_client.go
+++ b/service/s3outposts/api_client.go
@@ -224,15 +224,15 @@ func (c *Client) invokeOperation(ctx context.Context, opID string, params interf
 
 type noSmithyDocumentSerde = smithydocument.NoSerde
 
-type LegacyEndpointContextSetter struct {
+type legacyEndpointContextSetter struct {
 	LegacyResolver EndpointResolver
 }
 
-func (*LegacyEndpointContextSetter) ID() string {
-	return "LegacyEndpointContextSetter"
+func (*legacyEndpointContextSetter) ID() string {
+	return "legacyEndpointContextSetter"
 }
 
-func (m *LegacyEndpointContextSetter) HandleInitialize(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) (
+func (m *legacyEndpointContextSetter) HandleInitialize(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) (
 	out middleware.InitializeOutput, metadata middleware.Metadata, err error,
 ) {
 	if m.LegacyResolver != nil {
@@ -242,8 +242,8 @@ func (m *LegacyEndpointContextSetter) HandleInitialize(ctx context.Context, in m
 	return next.HandleInitialize(ctx, in)
 
 }
-func addLegacyEndpointContextSetter(stack *middleware.Stack, o Options) error {
-	return stack.Initialize.Add(&LegacyEndpointContextSetter{
+func addlegacyEndpointContextSetter(stack *middleware.Stack, o Options) error {
+	return stack.Initialize.Add(&legacyEndpointContextSetter{
 		LegacyResolver: o.EndpointResolver,
 	}, middleware.Before)
 }
@@ -476,15 +476,15 @@ func addRequestResponseLogging(stack *middleware.Stack, o Options) error {
 	}, middleware.After)
 }
 
-type EndpointDisableHTTPSMiddleware struct {
+type endpointDisableHTTPSMiddleware struct {
 	EndpointDisableHTTPS bool
 }
 
-func (*EndpointDisableHTTPSMiddleware) ID() string {
-	return "EndpointDisableHTTPSMiddleware"
+func (*endpointDisableHTTPSMiddleware) ID() string {
+	return "endpointDisableHTTPSMiddleware"
 }
 
-func (m *EndpointDisableHTTPSMiddleware) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
+func (m *endpointDisableHTTPSMiddleware) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
 	out middleware.SerializeOutput, metadata middleware.Metadata, err error,
 ) {
 	req, ok := in.Request.(*smithyhttp.Request)
@@ -499,8 +499,8 @@ func (m *EndpointDisableHTTPSMiddleware) HandleSerialize(ctx context.Context, in
 	return next.HandleSerialize(ctx, in)
 
 }
-func addEndpointDisableHTTPSMiddleware(stack *middleware.Stack, o Options) error {
-	return stack.Serialize.Insert(&EndpointDisableHTTPSMiddleware{
+func addendpointDisableHTTPSMiddleware(stack *middleware.Stack, o Options) error {
+	return stack.Serialize.Insert(&endpointDisableHTTPSMiddleware{
 		EndpointDisableHTTPS: o.EndpointOptions.DisableHTTPS,
 	}, "ResolveEndpointV2", middleware.After)
 }
diff --git a/service/s3outposts/api_op_CreateEndpoint.go b/service/s3outposts/api_op_CreateEndpoint.go
index cd1ea95d653..48a69dde821 100644
--- a/service/s3outposts/api_op_CreateEndpoint.go
+++ b/service/s3outposts/api_op_CreateEndpoint.go
@@ -87,7 +87,7 @@ func (c *Client) addOperationCreateEndpointMiddlewares(stack *middleware.Stack,
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -147,7 +147,7 @@ func (c *Client) addOperationCreateEndpointMiddlewares(stack *middleware.Stack,
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -206,8 +206,6 @@ func (m *opCreateEndpointResolveEndpointMiddleware) HandleSerialize(ctx context.
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3outposts/api_op_DeleteEndpoint.go b/service/s3outposts/api_op_DeleteEndpoint.go
index 4b8baa55512..b6764d1ba5b 100644
--- a/service/s3outposts/api_op_DeleteEndpoint.go
+++ b/service/s3outposts/api_op_DeleteEndpoint.go
@@ -65,7 +65,7 @@ func (c *Client) addOperationDeleteEndpointMiddlewares(stack *middleware.Stack,
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -125,7 +125,7 @@ func (c *Client) addOperationDeleteEndpointMiddlewares(stack *middleware.Stack,
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -184,8 +184,6 @@ func (m *opDeleteEndpointResolveEndpointMiddleware) HandleSerialize(ctx context.
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3outposts/api_op_ListEndpoints.go b/service/s3outposts/api_op_ListEndpoints.go
index 3f421061002..1c642c5622d 100644
--- a/service/s3outposts/api_op_ListEndpoints.go
+++ b/service/s3outposts/api_op_ListEndpoints.go
@@ -71,7 +71,7 @@ func (c *Client) addOperationListEndpointsMiddlewares(stack *middleware.Stack, o
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -128,7 +128,7 @@ func (c *Client) addOperationListEndpointsMiddlewares(stack *middleware.Stack, o
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -272,8 +272,6 @@ func (m *opListEndpointsResolveEndpointMiddleware) HandleSerialize(ctx context.C
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3outposts/api_op_ListOutpostsWithS3.go b/service/s3outposts/api_op_ListOutpostsWithS3.go
index 5a155a08a9c..ebe25b221a7 100644
--- a/service/s3outposts/api_op_ListOutpostsWithS3.go
+++ b/service/s3outposts/api_op_ListOutpostsWithS3.go
@@ -74,7 +74,7 @@ func (c *Client) addOperationListOutpostsWithS3Middlewares(stack *middleware.Sta
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -131,7 +131,7 @@ func (c *Client) addOperationListOutpostsWithS3Middlewares(stack *middleware.Sta
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -277,8 +277,6 @@ func (m *opListOutpostsWithS3ResolveEndpointMiddleware) HandleSerialize(ctx cont
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError
diff --git a/service/s3outposts/api_op_ListSharedEndpoints.go b/service/s3outposts/api_op_ListSharedEndpoints.go
index 26a90597e4c..ceb49abf2ba 100644
--- a/service/s3outposts/api_op_ListSharedEndpoints.go
+++ b/service/s3outposts/api_op_ListSharedEndpoints.go
@@ -78,7 +78,7 @@ func (c *Client) addOperationListSharedEndpointsMiddlewares(stack *middleware.St
 	if err != nil {
 		return err
 	}
-	if err = addLegacyEndpointContextSetter(stack, options); err != nil {
+	if err = addlegacyEndpointContextSetter(stack, options); err != nil {
 		return err
 	}
 	if err = addSetLoggerMiddleware(stack, options); err != nil {
@@ -138,7 +138,7 @@ func (c *Client) addOperationListSharedEndpointsMiddlewares(stack *middleware.St
 	if err = addRequestResponseLogging(stack, options); err != nil {
 		return err
 	}
-	if err = addEndpointDisableHTTPSMiddleware(stack, options); err != nil {
+	if err = addendpointDisableHTTPSMiddleware(stack, options); err != nil {
 		return err
 	}
 	return nil
@@ -284,8 +284,6 @@ func (m *opListSharedEndpointsResolveEndpointMiddleware) HandleSerialize(ctx con
 		)
 	}
 
-	ctx = smithyhttp.DisableEndpointHostPrefix(ctx, true)
-
 	authSchemes, err := internalauth.GetAuthenticationSchemes(&resolvedEndpoint.Properties)
 	if err != nil {
 		var nfe *internalauth.NoAuthenticationSchemesFoundError