diff --git a/internal/protocoltest/jsonrpc/api_op_JsonEnums_test.go b/internal/protocoltest/jsonrpc/api_op_JsonEnums_test.go
index 643f8281448..d81300ac973 100644
--- a/internal/protocoltest/jsonrpc/api_op_JsonEnums_test.go
+++ b/internal/protocoltest/jsonrpc/api_op_JsonEnums_test.go
@@ -35,20 +35,20 @@ func TestClient_JsonEnums_awsAwsjson11Serialize(t *testing.T) {
 		// Serializes simple scalar properties
 		"AwsJson11Enums": {
 			Params: &JsonEnumsInput{
-				FooEnum1: "Foo",
-				FooEnum2: "0",
-				FooEnum3: "1",
+				FooEnum1: types.FooEnum("Foo"),
+				FooEnum2: types.FooEnum("0"),
+				FooEnum3: types.FooEnum("1"),
 				FooEnumList: []types.FooEnum{
-					"Foo",
-					"0",
+					types.FooEnum("Foo"),
+					types.FooEnum("0"),
 				},
 				FooEnumSet: []types.FooEnum{
-					"Foo",
-					"0",
+					types.FooEnum("Foo"),
+					types.FooEnum("0"),
 				},
 				FooEnumMap: map[string]types.FooEnum{
-					"hi":   "Foo",
-					"zero": "0",
+					"hi":   types.FooEnum("Foo"),
+					"zero": types.FooEnum("0"),
 				},
 			},
 			ExpectMethod:  "POST",
@@ -171,20 +171,20 @@ func TestClient_JsonEnums_awsAwsjson11Deserialize(t *testing.T) {
 			    }
 			}`),
 			ExpectResult: &JsonEnumsOutput{
-				FooEnum1: "Foo",
-				FooEnum2: "0",
-				FooEnum3: "1",
+				FooEnum1: types.FooEnum("Foo"),
+				FooEnum2: types.FooEnum("0"),
+				FooEnum3: types.FooEnum("1"),
 				FooEnumList: []types.FooEnum{
-					"Foo",
-					"0",
+					types.FooEnum("Foo"),
+					types.FooEnum("0"),
 				},
 				FooEnumSet: []types.FooEnum{
-					"Foo",
-					"0",
+					types.FooEnum("Foo"),
+					types.FooEnum("0"),
 				},
 				FooEnumMap: map[string]types.FooEnum{
-					"hi":   "Foo",
-					"zero": "0",
+					"hi":   types.FooEnum("Foo"),
+					"zero": types.FooEnum("0"),
 				},
 			},
 		},
diff --git a/internal/protocoltest/jsonrpc/deserializers.go b/internal/protocoltest/jsonrpc/deserializers.go
index 00bec0ada87..efc751d89a2 100644
--- a/internal/protocoltest/jsonrpc/deserializers.go
+++ b/internal/protocoltest/jsonrpc/deserializers.go
@@ -21,7 +21,7 @@ type awsAwsjson11_deserializeOpEmptyOperation struct {
 }
 
 func (*awsAwsjson11_deserializeOpEmptyOperation) ID() string {
-	return "awsAwsjson11_deserializeOpEmptyOperation"
+	return "OperationDeserializer"
 }
 
 func (m *awsAwsjson11_deserializeOpEmptyOperation) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
@@ -120,7 +120,7 @@ type awsAwsjson11_deserializeOpGreetingWithErrors struct {
 }
 
 func (*awsAwsjson11_deserializeOpGreetingWithErrors) ID() string {
-	return "awsAwsjson11_deserializeOpGreetingWithErrors"
+	return "OperationDeserializer"
 }
 
 func (m *awsAwsjson11_deserializeOpGreetingWithErrors) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
@@ -228,7 +228,7 @@ type awsAwsjson11_deserializeOpJsonEnums struct {
 }
 
 func (*awsAwsjson11_deserializeOpJsonEnums) ID() string {
-	return "awsAwsjson11_deserializeOpJsonEnums"
+	return "OperationDeserializer"
 }
 
 func (m *awsAwsjson11_deserializeOpJsonEnums) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
@@ -327,7 +327,7 @@ type awsAwsjson11_deserializeOpKitchenSinkOperation struct {
 }
 
 func (*awsAwsjson11_deserializeOpKitchenSinkOperation) ID() string {
-	return "awsAwsjson11_deserializeOpKitchenSinkOperation"
+	return "OperationDeserializer"
 }
 
 func (m *awsAwsjson11_deserializeOpKitchenSinkOperation) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
@@ -432,7 +432,7 @@ type awsAwsjson11_deserializeOpNullOperation struct {
 }
 
 func (*awsAwsjson11_deserializeOpNullOperation) ID() string {
-	return "awsAwsjson11_deserializeOpNullOperation"
+	return "OperationDeserializer"
 }
 
 func (m *awsAwsjson11_deserializeOpNullOperation) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
@@ -531,7 +531,7 @@ type awsAwsjson11_deserializeOpOperationWithOptionalInputOutput struct {
 }
 
 func (*awsAwsjson11_deserializeOpOperationWithOptionalInputOutput) ID() string {
-	return "awsAwsjson11_deserializeOpOperationWithOptionalInputOutput"
+	return "OperationDeserializer"
 }
 
 func (m *awsAwsjson11_deserializeOpOperationWithOptionalInputOutput) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
@@ -630,7 +630,7 @@ type awsAwsjson11_deserializeOpPutAndGetInlineDocuments struct {
 }
 
 func (*awsAwsjson11_deserializeOpPutAndGetInlineDocuments) ID() string {
-	return "awsAwsjson11_deserializeOpPutAndGetInlineDocuments"
+	return "OperationDeserializer"
 }
 
 func (m *awsAwsjson11_deserializeOpPutAndGetInlineDocuments) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
diff --git a/internal/protocoltest/jsonrpc/serializers.go b/internal/protocoltest/jsonrpc/serializers.go
index 8613729198f..cb339936392 100644
--- a/internal/protocoltest/jsonrpc/serializers.go
+++ b/internal/protocoltest/jsonrpc/serializers.go
@@ -18,7 +18,7 @@ type awsAwsjson11_serializeOpEmptyOperation struct {
 }
 
 func (*awsAwsjson11_serializeOpEmptyOperation) ID() string {
-	return "awsAwsjson11_serializeOpEmptyOperation"
+	return "OperationSerializer"
 }
 
 func (m *awsAwsjson11_serializeOpEmptyOperation) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
@@ -64,7 +64,7 @@ type awsAwsjson11_serializeOpGreetingWithErrors struct {
 }
 
 func (*awsAwsjson11_serializeOpGreetingWithErrors) ID() string {
-	return "awsAwsjson11_serializeOpGreetingWithErrors"
+	return "OperationSerializer"
 }
 
 func (m *awsAwsjson11_serializeOpGreetingWithErrors) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
@@ -110,7 +110,7 @@ type awsAwsjson11_serializeOpJsonEnums struct {
 }
 
 func (*awsAwsjson11_serializeOpJsonEnums) ID() string {
-	return "awsAwsjson11_serializeOpJsonEnums"
+	return "OperationSerializer"
 }
 
 func (m *awsAwsjson11_serializeOpJsonEnums) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
@@ -156,7 +156,7 @@ type awsAwsjson11_serializeOpKitchenSinkOperation struct {
 }
 
 func (*awsAwsjson11_serializeOpKitchenSinkOperation) ID() string {
-	return "awsAwsjson11_serializeOpKitchenSinkOperation"
+	return "OperationSerializer"
 }
 
 func (m *awsAwsjson11_serializeOpKitchenSinkOperation) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
@@ -202,7 +202,7 @@ type awsAwsjson11_serializeOpNullOperation struct {
 }
 
 func (*awsAwsjson11_serializeOpNullOperation) ID() string {
-	return "awsAwsjson11_serializeOpNullOperation"
+	return "OperationSerializer"
 }
 
 func (m *awsAwsjson11_serializeOpNullOperation) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
@@ -248,7 +248,7 @@ type awsAwsjson11_serializeOpOperationWithOptionalInputOutput struct {
 }
 
 func (*awsAwsjson11_serializeOpOperationWithOptionalInputOutput) ID() string {
-	return "awsAwsjson11_serializeOpOperationWithOptionalInputOutput"
+	return "OperationSerializer"
 }
 
 func (m *awsAwsjson11_serializeOpOperationWithOptionalInputOutput) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
@@ -294,7 +294,7 @@ type awsAwsjson11_serializeOpPutAndGetInlineDocuments struct {
 }
 
 func (*awsAwsjson11_serializeOpPutAndGetInlineDocuments) ID() string {
-	return "awsAwsjson11_serializeOpPutAndGetInlineDocuments"
+	return "OperationSerializer"
 }
 
 func (m *awsAwsjson11_serializeOpPutAndGetInlineDocuments) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (