diff --git a/codegen/sdk-codegen/aws-models/appconfigdata.json b/codegen/sdk-codegen/aws-models/appconfigdata.json
index 7a56eccee1e..dce683a2a86 100644
--- a/codegen/sdk-codegen/aws-models/appconfigdata.json
+++ b/codegen/sdk-codegen/aws-models/appconfigdata.json
@@ -82,9 +82,6 @@
                 ]
             }
         },
-        "com.amazonaws.appconfigdata#Blob": {
-            "type": "blob"
-        },
         "com.amazonaws.appconfigdata#ConfigurationSession": {
             "type": "resource",
             "identifiers": {
@@ -166,11 +163,10 @@
                     }
                 },
                 "Configuration": {
-                    "target": "com.amazonaws.appconfigdata#Blob",
+                    "target": "com.amazonaws.appconfigdata#SensitiveBlob",
                     "traits": {
                         "smithy.api#documentation": "<p>The data of the configuration. This may be empty if the client already has the latest\n         version of configuration.</p>",
-                        "smithy.api#httpPayload": {},
-                        "smithy.api#sensitive": {}
+                        "smithy.api#httpPayload": {}
                     }
                 }
             }
@@ -318,6 +314,12 @@
                 ]
             }
         },
+        "com.amazonaws.appconfigdata#SensitiveBlob": {
+            "type": "blob",
+            "traits": {
+                "smithy.api#sensitive": {}
+            }
+        },
         "com.amazonaws.appconfigdata#StartConfigurationSession": {
             "type": "operation",
             "input": {
@@ -424,4 +426,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/codegen/sdk-codegen/aws-models/kafkaconnect.json b/codegen/sdk-codegen/aws-models/kafkaconnect.json
index c773589d2d0..37d637406e6 100644
--- a/codegen/sdk-codegen/aws-models/kafkaconnect.json
+++ b/codegen/sdk-codegen/aws-models/kafkaconnect.json
@@ -471,11 +471,10 @@
                     }
                 },
                 "connectorConfiguration": {
-                    "target": "com.amazonaws.kafkaconnect#__mapOf__string",
+                    "target": "com.amazonaws.kafkaconnect#__sensitive__mapOf__string",
                     "traits": {
                         "smithy.api#documentation": "<p>A map of keys to values that represent the configuration for the connector.</p>",
-                        "smithy.api#required": {},
-                        "smithy.api#sensitive": {}
+                        "smithy.api#required": {}
                     }
                 },
                 "connectorDescription": {
@@ -734,11 +733,10 @@
                     }
                 },
                 "propertiesFileContent": {
-                    "target": "com.amazonaws.kafkaconnect#__string",
+                    "target": "com.amazonaws.kafkaconnect#__sensitiveString",
                     "traits": {
                         "smithy.api#documentation": "<p>Base64 encoded contents of connect-distributed.properties file.</p>",
-                        "smithy.api#required": {},
-                        "smithy.api#sensitive": {}
+                        "smithy.api#required": {}
                     }
                 }
             }
@@ -1216,10 +1214,9 @@
                     }
                 },
                 "connectorConfiguration": {
-                    "target": "com.amazonaws.kafkaconnect#__mapOf__string",
+                    "target": "com.amazonaws.kafkaconnect#__sensitive__mapOf__string",
                     "traits": {
-                        "smithy.api#documentation": "<p>A map of keys to values that represent the configuration for the connector.</p>",
-                        "smithy.api#sensitive": {}
+                        "smithy.api#documentation": "<p>A map of keys to values that represent the configuration for the connector.</p>"
                     }
                 },
                 "connectorDescription": {
@@ -2586,10 +2583,9 @@
                     }
                 },
                 "propertiesFileContent": {
-                    "target": "com.amazonaws.kafkaconnect#__string",
+                    "target": "com.amazonaws.kafkaconnect#__sensitiveString",
                     "traits": {
-                        "smithy.api#documentation": "<p>Base64 encoded contents of the connect-distributed.properties file.</p>",
-                        "smithy.api#sensitive": {}
+                        "smithy.api#documentation": "<p>Base64 encoded contents of the connect-distributed.properties file.</p>"
                     }
                 },
                 "revision": {
@@ -2800,13 +2796,22 @@
                 }
             }
         },
-        "com.amazonaws.kafkaconnect#__mapOf__string": {
+        "com.amazonaws.kafkaconnect#__sensitiveString": {
+            "type": "string",
+            "traits": {
+                "smithy.api#sensitive": {}
+            }
+        },
+        "com.amazonaws.kafkaconnect#__sensitive__mapOf__string": {
             "type": "map",
             "key": {
                 "target": "com.amazonaws.kafkaconnect#__string"
             },
             "value": {
                 "target": "com.amazonaws.kafkaconnect#__string"
+            },
+            "traits": {
+                "smithy.api#sensitive": {}
             }
         },
         "com.amazonaws.kafkaconnect#__string": {
@@ -2837,4 +2842,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/service/kafkaconnect/deserializers.go b/service/kafkaconnect/deserializers.go
index 84eb041e6c8..bc35cd03d7e 100644
--- a/service/kafkaconnect/deserializers.go
+++ b/service/kafkaconnect/deserializers.go
@@ -1133,7 +1133,7 @@ func awsRestjson1_deserializeOpDocumentDescribeConnectorOutput(v **DescribeConne
 			}
 
 		case "connectorConfiguration":
-			if err := awsRestjson1_deserializeDocument__mapOf__string(&sv.ConnectorConfiguration, value); err != nil {
+			if err := awsRestjson1_deserializeDocument__sensitive__mapOf__string(&sv.ConnectorConfiguration, value); err != nil {
 				return err
 			}
 
@@ -2832,7 +2832,7 @@ func awsRestjson1_deserializeDocument__listOfWorkerConfigurationSummary(v *[]typ
 	return nil
 }
 
-func awsRestjson1_deserializeDocument__mapOf__string(v *map[string]string, value interface{}) error {
+func awsRestjson1_deserializeDocument__sensitive__mapOf__string(v *map[string]string, value interface{}) error {
 	if v == nil {
 		return fmt.Errorf("unexpected nil of type %T", v)
 	}
@@ -4546,7 +4546,7 @@ func awsRestjson1_deserializeDocumentWorkerConfigurationRevisionDescription(v **
 			if value != nil {
 				jtv, ok := value.(string)
 				if !ok {
-					return fmt.Errorf("expected __string to be of type string, got %T instead", value)
+					return fmt.Errorf("expected __sensitiveString to be of type string, got %T instead", value)
 				}
 				sv.PropertiesFileContent = ptr.String(jtv)
 			}
diff --git a/service/kafkaconnect/serializers.go b/service/kafkaconnect/serializers.go
index de18e8a8c17..303381c9ef8 100644
--- a/service/kafkaconnect/serializers.go
+++ b/service/kafkaconnect/serializers.go
@@ -83,7 +83,7 @@ func awsRestjson1_serializeOpDocumentCreateConnectorInput(v *CreateConnectorInpu
 
 	if v.ConnectorConfiguration != nil {
 		ok := object.Key("connectorConfiguration")
-		if err := awsRestjson1_serializeDocument__mapOf__string(v.ConnectorConfiguration, ok); err != nil {
+		if err := awsRestjson1_serializeDocument__sensitive__mapOf__string(v.ConnectorConfiguration, ok); err != nil {
 			return err
 		}
 	}
@@ -896,7 +896,7 @@ func awsRestjson1_serializeDocument__listOfPlugin(v []types.Plugin, value smithy
 	return nil
 }
 
-func awsRestjson1_serializeDocument__mapOf__string(v map[string]string, value smithyjson.Value) error {
+func awsRestjson1_serializeDocument__sensitive__mapOf__string(v map[string]string, value smithyjson.Value) error {
 	object := value.Object()
 	defer object.Close()