diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/IntermediateModelBuilder.java b/codegen/src/main/java/software/amazon/awssdk/codegen/IntermediateModelBuilder.java
index 66df8fe572b..74374b40cd3 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/IntermediateModelBuilder.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/IntermediateModelBuilder.java
@@ -253,14 +253,16 @@ private void setSimpleMethods(IntermediateModel model) {
             } else {
                 inputShape.setSimpleMethod(false);
 
-                boolean methodIsNotBlacklisted = !config.getBlacklistedSimpleMethods().contains(methodName) ||
-                                                 config.getBlacklistedSimpleMethods().stream().noneMatch(m -> m.equals("*"));
+                boolean methodIsNotExcluded = !config.getExcludedSimpleMethods().contains(methodName) ||
+                                              config.getExcludedSimpleMethods().stream().noneMatch(m -> m.equals("*")) ||
+                                              !config.getBlacklistedSimpleMethods().contains(methodName) ||
+                                              config.getBlacklistedSimpleMethods().stream().noneMatch(m -> m.equals("*"));
                 boolean methodHasNoRequiredMembers = !CollectionUtils.isNullOrEmpty(inputShape.getRequired());
                 boolean methodIsNotStreaming = !operation.isStreaming();
                 boolean methodHasSimpleMethodVerb = methodName.matches(Constant.APPROVED_SIMPLE_METHOD_VERBS);
 
-                if (methodIsNotBlacklisted && methodHasNoRequiredMembers && methodIsNotStreaming && methodHasSimpleMethodVerb) {
-                    log.warn("A potential simple method exists that isn't whitelisted or blacklisted: " + methodName);
+                if (methodIsNotExcluded && methodHasNoRequiredMembers && methodIsNotStreaming && methodHasSimpleMethodVerb) {
+                    log.warn("A potential simple method exists that isn't explicitly excluded or included: " + methodName);
                 }
             }
         });
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java
index 0bef67df786..f54d5db2332 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java
@@ -103,6 +103,13 @@ public class CustomizationConfig {
     /**
      * APIs that have no required arguments in their model but can't be called via a simple method
      */
+    private List<String> excludedSimpleMethods = new ArrayList<>();
+
+    /**
+     * APIs that have no required arguments in their model but can't be called via a simple method.
+     * Superseded by {@link #excludedSimpleMethods}
+     */
+    @Deprecated
     private List<String> blacklistedSimpleMethods = new ArrayList<>();
 
     /**
@@ -373,10 +380,26 @@ public void setServiceSpecificHttpConfig(String serviceSpecificHttpConfig) {
         this.serviceSpecificHttpConfig = serviceSpecificHttpConfig;
     }
 
+    public List<String> getExcludedSimpleMethods() {
+        return excludedSimpleMethods;
+    }
+
+    public void setExcludedSimpleMethods(List<String> excludedSimpleMethods) {
+        this.excludedSimpleMethods = excludedSimpleMethods;
+    }
+
+    /**
+     * Use {@link #getExcludedSimpleMethods()}
+     */
+    @Deprecated
     public List<String> getBlacklistedSimpleMethods() {
         return blacklistedSimpleMethods;
     }
 
+    /**
+     * Use {@link #setExcludedSimpleMethods(List)}
+     */
+    @Deprecated
     public void setBlacklistedSimpleMethods(List<String> blackListedSimpleMethods) {
         this.blacklistedSimpleMethods = blackListedSimpleMethods;
     }
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/json/customization.config b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/json/customization.config
index af7f5cb4564..a54af7a0a2c 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/json/customization.config
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/json/customization.config
@@ -11,7 +11,7 @@
     },
     "customRetryPolicy": "software.amazon.MyServiceRetryPolicy",
     "verifiedSimpleMethods" : ["paginatedOperationWithResultKey"],
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "eventStreamOperation"
     ],
   "utilitiesMethod": {
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/rest-json/customization.config b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/rest-json/customization.config
index e13cec317ff..32b15896ce5 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/rest-json/customization.config
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/rest-json/customization.config
@@ -15,7 +15,7 @@
     },
     "customRetryPolicy": "software.amazon.MyServiceRetryPolicy",
     "verifiedSimpleMethods" : ["paginatedOperationWithResultKey"],
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "eventStreamOperation"
     ],
   "utilitiesMethod": {
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/customization.config b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/customization.config
index e1206b3fd91..213183ce5a8 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/customization.config
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/customization.config
@@ -1,5 +1,5 @@
 {
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "allTypes",
         "nestedContainers",
         "operationWithNoInputOrOutput",
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/customresponsemetadata/customization.config b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/customresponsemetadata/customization.config
index d3b7f5d49d4..73d3ee1594f 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/customresponsemetadata/customization.config
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/customresponsemetadata/customization.config
@@ -1,5 +1,5 @@
 {
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "allTypes",
         "nestedContainers",
         "operationWithNoInputOrOutput",
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/customization.config b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/customization.config
index 5e44eaa81f8..ced0f694b18 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/customization.config
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/customization.config
@@ -1,5 +1,5 @@
 {
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "allTypes",
     "nestedContainers",
     "operationWithNoInputOrOutput",
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/paginators/customization.config b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/paginators/customization.config
index 78f3be1bf76..2f34e03ed04 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/paginators/customization.config
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/paginators/customization.config
@@ -1,5 +1,5 @@
 {
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "allTypes",
         "nestedContainers",
         "operationWithNoInputOrOutput"
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/customization.config b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/customization.config
index b57099f2d79..e66eb09003a 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/customization.config
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/customization.config
@@ -1,5 +1,5 @@
 {
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "allTypes",
         "nestedContainers",
         "operationWithNoInputOrOutput",
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryOnExceptionsCondition.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryOnExceptionsCondition.java
index ab143731c93..5589f67ffba 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryOnExceptionsCondition.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryOnExceptionsCondition.java
@@ -42,8 +42,8 @@ private RetryOnExceptionsCondition(Set<Class<? extends Exception>> exceptionsToR
 
     /**
      * @param context Context about the state of the last request and information about the number of requests made.
-     * @return True if the exception class matches one of the whitelisted exceptions or if the cause of the exception matches the
-     *     whitelisted exception.
+     * @return True if the exception class or the cause of the exception matches one of the exceptions supplied at
+     * initialization time.
      */
     @Override
     public boolean shouldRetry(RetryPolicyContext context) {
@@ -56,10 +56,10 @@ public boolean shouldRetry(RetryPolicyContext context) {
         Predicate<Class<? extends Exception>> isRetryableException =
             ex -> ex.isAssignableFrom(exception.getClass());
 
-        Predicate<Class<? extends Exception>> hasRetrableCause =
+        Predicate<Class<? extends Exception>> hasRetryableCause =
             ex -> exception.getCause() != null && ex.isAssignableFrom(exception.getCause().getClass());
 
-        return exceptionsToRetryOn.stream().anyMatch(isRetryableException.or(hasRetrableCause));
+        return exceptionsToRetryOn.stream().anyMatch(isRetryableException.or(hasRetryableCause));
     }
 
     /**
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/SdkUserAgent.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/SdkUserAgent.java
index f87a70dd550..bbaa7dd2253 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/SdkUserAgent.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/SdkUserAgent.java
@@ -38,7 +38,7 @@ public final class SdkUserAgent {
                                             + "vendor/{java.vendor}";
 
     /** Disallowed characters in the user agent token: @see <a href="https://tools.ietf.org/html/rfc7230#section-3.2.6">RFC 7230</a> */
-    private static final String UA_BLACKLIST_REGEX = "[() ,/:;<=>?@\\[\\]{}\\\\]";
+    private static final String UA_DENYLIST_REGEX = "[() ,/:;<=>?@\\[\\]{}\\\\]";
 
     /** Shared logger for any issues while loading version information. */
     private static final Logger log = LoggerFactory.getLogger(SdkUserAgent.class);
@@ -125,7 +125,7 @@ String getUserAgent() {
      * @return the input with spaces replaced by underscores
      */
     private static String sanitizeInput(String input) {
-        return input == null ? UNKNOWN : input.replaceAll(UA_BLACKLIST_REGEX, "_");
+        return input == null ? UNKNOWN : input.replaceAll(UA_DENYLIST_REGEX, "_");
     }
 
     private static String getAdditionalJvmLanguages() {
diff --git a/services/alexaforbusiness/src/main/resources/codegen-resources/customization.config b/services/alexaforbusiness/src/main/resources/codegen-resources/customization.config
index a07c63b58af..9ef3f846f7a 100644
--- a/services/alexaforbusiness/src/main/resources/codegen-resources/customization.config
+++ b/services/alexaforbusiness/src/main/resources/codegen-resources/customization.config
@@ -1,3 +1,3 @@
 {
-    "blacklistedSimpleMethods" : ["*"]
+    "excludedSimpleMethods" : ["*"]
 }
diff --git a/services/apigateway/src/main/resources/codegen-resources/customization.config b/services/apigateway/src/main/resources/codegen-resources/customization.config
index 040a30404bf..9662110a579 100644
--- a/services/apigateway/src/main/resources/codegen-resources/customization.config
+++ b/services/apigateway/src/main/resources/codegen-resources/customization.config
@@ -4,7 +4,7 @@
       "emitAsShape": "String"
     }
   },
-  "blacklistedSimpleMethods" : [
+  "excludedSimpleMethods" : [
     "updateAccount",
     "createApiKey",
     "generateClientCertificate"
diff --git a/services/applicationdiscovery/src/main/resources/codegen-resources/customization.config b/services/applicationdiscovery/src/main/resources/codegen-resources/customization.config
index 4864947dd29..d46992d3cb0 100644
--- a/services/applicationdiscovery/src/main/resources/codegen-resources/customization.config
+++ b/services/applicationdiscovery/src/main/resources/codegen-resources/customization.config
@@ -9,7 +9,7 @@
         "describeExportConfigurations",
         "getDiscoverySummary"
     ],
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "startContinuousExport",
         "describeContinuousExports"
     ],
diff --git a/services/appstream/src/main/resources/codegen-resources/customization.config b/services/appstream/src/main/resources/codegen-resources/customization.config
index d6ce3dce1a2..b605d120b9a 100644
--- a/services/appstream/src/main/resources/codegen-resources/customization.config
+++ b/services/appstream/src/main/resources/codegen-resources/customization.config
@@ -1,5 +1,5 @@
 {
-     "blacklistedSimpleMethods" : [
+     "excludedSimpleMethods" : [
         "updateFleet",
          "describeUserStackAssociations"
      ],
diff --git a/services/backup/src/main/resources/codegen-resources/customization.config b/services/backup/src/main/resources/codegen-resources/customization.config
index 6dc94898135..1cb199bb471 100644
--- a/services/backup/src/main/resources/codegen-resources/customization.config
+++ b/services/backup/src/main/resources/codegen-resources/customization.config
@@ -1,5 +1,5 @@
 {
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "getSupportedResourceTypes"
     ],
     "verifiedSimpleMethods" : [
diff --git a/services/batch/src/main/resources/codegen-resources/customization.config b/services/batch/src/main/resources/codegen-resources/customization.config
index c597ff8c197..ef427d6052c 100644
--- a/services/batch/src/main/resources/codegen-resources/customization.config
+++ b/services/batch/src/main/resources/codegen-resources/customization.config
@@ -4,7 +4,7 @@
     "describeJobDefinitions",
     "describeJobQueues"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "listJobs"
   ]
 }
diff --git a/services/cloudformation/src/main/resources/codegen-resources/customization.config b/services/cloudformation/src/main/resources/codegen-resources/customization.config
index a88012d0b42..e7b4b0ab5bf 100644
--- a/services/cloudformation/src/main/resources/codegen-resources/customization.config
+++ b/services/cloudformation/src/main/resources/codegen-resources/customization.config
@@ -17,7 +17,7 @@
       ]
     }
   },
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "estimateTemplateCost",
     "validateTemplate",
     "getTemplate",
diff --git a/services/cloudhsm/src/main/resources/codegen-resources/customization.config b/services/cloudhsm/src/main/resources/codegen-resources/customization.config
index df5ba497398..7477c0a69fc 100644
--- a/services/cloudhsm/src/main/resources/codegen-resources/customization.config
+++ b/services/cloudhsm/src/main/resources/codegen-resources/customization.config
@@ -14,7 +14,7 @@
       "exclude": [ "retryable" ]
     }
   },
-  "blacklistedSimpleMethods" : [
+  "excludedSimpleMethods" : [
     "describeHsm",
     "describeLunaClient"
   ],
diff --git a/services/cloudwatch/src/main/resources/codegen-resources/customization.config b/services/cloudwatch/src/main/resources/codegen-resources/customization.config
index 5c580ec8563..d819241c371 100644
--- a/services/cloudwatch/src/main/resources/codegen-resources/customization.config
+++ b/services/cloudwatch/src/main/resources/codegen-resources/customization.config
@@ -5,7 +5,7 @@
     "listDashboards",
     "listMetrics"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "deleteDashboards",
     "putDashboard",
     "getDashboard"
diff --git a/services/cloudwatchlogs/src/main/resources/codegen-resources/customization.config b/services/cloudwatchlogs/src/main/resources/codegen-resources/customization.config
index dc10a538fc4..f61c7f5add4 100644
--- a/services/cloudwatchlogs/src/main/resources/codegen-resources/customization.config
+++ b/services/cloudwatchlogs/src/main/resources/codegen-resources/customization.config
@@ -1,5 +1,5 @@
 {
-  "blacklistedSimpleMethods" : [
+  "excludedSimpleMethods" : [
     "deleteResourcePolicy",
     "putResourcePolicy"
   ],
diff --git a/services/codecommit/src/main/resources/codegen-resources/customization.config b/services/codecommit/src/main/resources/codegen-resources/customization.config
index ca10e18215b..18a06a2c508 100644
--- a/services/codecommit/src/main/resources/codegen-resources/customization.config
+++ b/services/codecommit/src/main/resources/codegen-resources/customization.config
@@ -2,7 +2,7 @@
   "verifiedSimpleMethods": [
     "listRepositories"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "getBranch"
   ]
 }
diff --git a/services/codedeploy/src/main/resources/codegen-resources/customization.config b/services/codedeploy/src/main/resources/codegen-resources/customization.config
index 9ef3b906a84..3fa976b82ee 100644
--- a/services/codedeploy/src/main/resources/codegen-resources/customization.config
+++ b/services/codedeploy/src/main/resources/codegen-resources/customization.config
@@ -6,7 +6,7 @@
     "listGitHubAccountTokenNames",
     "listOnPremisesInstances"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "continueDeployment",
     "skipWaitTimeForInstanceTermination",
     "updateApplication",
diff --git a/services/codepipeline/src/main/resources/codegen-resources/customization.config b/services/codepipeline/src/main/resources/codegen-resources/customization.config
index aeb5a89163e..2239d96d258 100644
--- a/services/codepipeline/src/main/resources/codegen-resources/customization.config
+++ b/services/codepipeline/src/main/resources/codegen-resources/customization.config
@@ -4,7 +4,7 @@
     "listPipelines",
     "listWebhooks"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "deregisterWebhookWithThirdParty",
     "registerWebhookWithThirdParty"
   ]
diff --git a/services/cognitoidentityprovider/src/main/resources/codegen-resources/customization.config b/services/cognitoidentityprovider/src/main/resources/codegen-resources/customization.config
index e8cd40c8e33..0a61574c89d 100644
--- a/services/cognitoidentityprovider/src/main/resources/codegen-resources/customization.config
+++ b/services/cognitoidentityprovider/src/main/resources/codegen-resources/customization.config
@@ -1,5 +1,5 @@
 {
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "associateSoftwareToken"
     ],
     "shapeModifiers" : {
diff --git a/services/config/src/main/resources/codegen-resources/customization.config b/services/config/src/main/resources/codegen-resources/customization.config
index 9a537e0cc59..d113522aaf3 100644
--- a/services/config/src/main/resources/codegen-resources/customization.config
+++ b/services/config/src/main/resources/codegen-resources/customization.config
@@ -16,7 +16,7 @@
     "getComplianceSummaryByResourceType",
     "getDiscoveredResourceCounts"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "startConfigRulesEvaluation"
   ]
 }
diff --git a/services/costandusagereport/src/main/resources/codegen-resources/customization.config b/services/costandusagereport/src/main/resources/codegen-resources/customization.config
index 6d58177dfd5..bb24e28984a 100644
--- a/services/costandusagereport/src/main/resources/codegen-resources/customization.config
+++ b/services/costandusagereport/src/main/resources/codegen-resources/customization.config
@@ -2,7 +2,7 @@
   "verifiedSimpleMethods": [
     "describeReportDefinitions"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "deleteReportDefinition"
   ]
 }
diff --git a/services/costexplorer/src/main/resources/codegen-resources/customization.config b/services/costexplorer/src/main/resources/codegen-resources/customization.config
index a8254fa7e84..09691b4543c 100644
--- a/services/costexplorer/src/main/resources/codegen-resources/customization.config
+++ b/services/costexplorer/src/main/resources/codegen-resources/customization.config
@@ -1,3 +1,3 @@
 {
-  "blacklistedSimpleMethods" : ["getCostAndUsage"]
+  "excludedSimpleMethods" : ["getCostAndUsage"]
 }
diff --git a/services/databasemigration/src/main/resources/codegen-resources/customization.config b/services/databasemigration/src/main/resources/codegen-resources/customization.config
index 76e134825e2..c746548fecc 100644
--- a/services/databasemigration/src/main/resources/codegen-resources/customization.config
+++ b/services/databasemigration/src/main/resources/codegen-resources/customization.config
@@ -13,7 +13,7 @@
     "describeReplicationSubnetGroups",
     "describeReplicationTasks"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "describeReplicationTaskAssessmentResults"
   ]
 }
diff --git a/services/devicefarm/src/main/resources/codegen-resources/customization.config b/services/devicefarm/src/main/resources/codegen-resources/customization.config
index 9672f49afb1..158dab87a46 100644
--- a/services/devicefarm/src/main/resources/codegen-resources/customization.config
+++ b/services/devicefarm/src/main/resources/codegen-resources/customization.config
@@ -10,7 +10,7 @@
     "listOfferings",
     "listProjects"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "purchaseOffering",
     "renewOffering",
     "listVPCEConfigurations"
diff --git a/services/directconnect/src/main/resources/codegen-resources/customization.config b/services/directconnect/src/main/resources/codegen-resources/customization.config
index dcf4f21ff80..4afc46a926a 100644
--- a/services/directconnect/src/main/resources/codegen-resources/customization.config
+++ b/services/directconnect/src/main/resources/codegen-resources/customization.config
@@ -8,7 +8,7 @@
     "describeVirtualGateways",
     "describeVirtualInterfaces"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "createBGPPeer",
     "deleteBGPPeer",
     "describeDirectConnectGatewayAttachments",
diff --git a/services/ec2/src/main/resources/codegen-resources/customization.config b/services/ec2/src/main/resources/codegen-resources/customization.config
index 1c08d1cf45f..61287b40d6e 100644
--- a/services/ec2/src/main/resources/codegen-resources/customization.config
+++ b/services/ec2/src/main/resources/codegen-resources/customization.config
@@ -330,7 +330,7 @@
       ]
     }
   },
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "acceptVpcPeeringConnection",
     "authorizeSecurityGroupIngress",
     "cancelImportTask",
diff --git a/services/ecs/src/main/resources/codegen-resources/customization.config b/services/ecs/src/main/resources/codegen-resources/customization.config
index 58e305ca06b..b0f923be73f 100644
--- a/services/ecs/src/main/resources/codegen-resources/customization.config
+++ b/services/ecs/src/main/resources/codegen-resources/customization.config
@@ -10,7 +10,7 @@
     "listTaskDefinitionFamilies",
     "listTaskDefinitions"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "discoverPollEndpoint",
     "registerContainerInstance",
     "submitContainerStateChange",
diff --git a/services/efs/src/main/resources/codegen-resources/customization.config b/services/efs/src/main/resources/codegen-resources/customization.config
index d2fe9be19d6..ea0753f0e30 100644
--- a/services/efs/src/main/resources/codegen-resources/customization.config
+++ b/services/efs/src/main/resources/codegen-resources/customization.config
@@ -2,7 +2,7 @@
   "verifiedSimpleMethods": [
     "describeFileSystems"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "describeMountTargets"
   ]
 }
diff --git a/services/elasticache/src/main/resources/codegen-resources/customization.config b/services/elasticache/src/main/resources/codegen-resources/customization.config
index ebe2ffd7cdf..8f466b4cef8 100644
--- a/services/elasticache/src/main/resources/codegen-resources/customization.config
+++ b/services/elasticache/src/main/resources/codegen-resources/customization.config
@@ -10,7 +10,7 @@
     "describeReservedCacheNodesOfferings",
     "describeSnapshots"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "describeCacheSecurityGroups",
     "listAllowedNodeTypeModifications"
   ]
diff --git a/services/elasticbeanstalk/src/main/resources/codegen-resources/customization.config b/services/elasticbeanstalk/src/main/resources/codegen-resources/customization.config
index b2845ceed17..f0f2660d273 100644
--- a/services/elasticbeanstalk/src/main/resources/codegen-resources/customization.config
+++ b/services/elasticbeanstalk/src/main/resources/codegen-resources/customization.config
@@ -17,7 +17,7 @@
            ]
         }
     },
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "abortEnvironmentUpdate",
         "composeEnvironments",
         "deletePlatformVersion",
diff --git a/services/elasticloadbalancingv2/src/main/resources/codegen-resources/customization.config b/services/elasticloadbalancingv2/src/main/resources/codegen-resources/customization.config
index 3d22a294f4b..45f2d8ee516 100644
--- a/services/elasticloadbalancingv2/src/main/resources/codegen-resources/customization.config
+++ b/services/elasticloadbalancingv2/src/main/resources/codegen-resources/customization.config
@@ -5,7 +5,7 @@
     "describeSSLPolicies",
     "describeTargetGroups"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "describeRules",
     "describeListeners"
   ]
diff --git a/services/emr/src/main/resources/codegen-resources/customization.config b/services/emr/src/main/resources/codegen-resources/customization.config
index 1bc9a6a3427..1e066e00e14 100644
--- a/services/emr/src/main/resources/codegen-resources/customization.config
+++ b/services/emr/src/main/resources/codegen-resources/customization.config
@@ -14,7 +14,7 @@
       ]
     }
   },
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "cancelSteps",
     "modifyInstanceGroups",
     "describeJobFlows"
diff --git a/services/firehose/src/it/java/software/amazon/awssdk/services/firehose/ServiceIntegrationTest.java b/services/firehose/src/it/java/software/amazon/awssdk/services/firehose/ServiceIntegrationTest.java
deleted file mode 100644
index 95277110d05..00000000000
--- a/services/firehose/src/it/java/software/amazon/awssdk/services/firehose/ServiceIntegrationTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *  http://aws.amazon.com/apache2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package software.amazon.awssdk.services.firehose;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import static software.amazon.awssdk.testutils.SdkAsserts.assertNotEmpty;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.List;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
-import software.amazon.awssdk.awscore.exception.AwsServiceException;
-import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.services.firehose.model.CreateDeliveryStreamRequest;
-import software.amazon.awssdk.services.firehose.model.ListDeliveryStreamsRequest;
-import software.amazon.awssdk.services.firehose.model.ListDeliveryStreamsResponse;
-import software.amazon.awssdk.services.firehose.model.PutRecordBatchRequest;
-import software.amazon.awssdk.services.firehose.model.PutRecordBatchResponseEntry;
-import software.amazon.awssdk.services.firehose.model.PutRecordRequest;
-import software.amazon.awssdk.services.firehose.model.Record;
-import software.amazon.awssdk.services.firehose.model.S3DestinationConfiguration;
-import software.amazon.awssdk.testutils.service.AwsTestBase;
-
-
-public class ServiceIntegrationTest extends AwsTestBase {
-
-    private static final String DEVLIVERY_STREAM_NAME = "java-sdk-delivery-stream-"
-                                                        + System.currentTimeMillis();
-    private static final String FAKE_S3_BUCKET_ARN = "arn:aws:s3:::fake-s3-bucket-arn";
-    private static final String FAKE_IAM_ROLE_ARN = "arn:aws:iam:::fake-iam-role-arn";
-
-    private static FirehoseClient firehose;
-
-
-    @BeforeClass
-    public static void setup() throws FileNotFoundException, IOException {
-        //        setUpCredentials();
-        //        firehose = new AmazonKinesisFirehoseClient(credentials);
-        //        s3 = new AmazonS3Client(credentials);
-
-        // TODO: firehose can't whitelist our shared account at this point, so
-        // for now we are using the test account provided by the firehose team
-        firehose = FirehoseClient.builder().credentialsProvider(CREDENTIALS_PROVIDER_CHAIN).build();
-    }
-
-    @AfterClass
-    public static void tearDown() {
-        //        firehose.deleteDeliveryStream(new DeleteDeliveryStreamRequest()
-        //                .withDeliveryStreamName(DEVLIVERY_STREAM_NAME));
-    }
-
-    //    @Test
-    // Nope, can't make it work without full access to S3 and IAM
-    public void testOperations() {
-
-        // create delivery stream
-        CreateDeliveryStreamRequest request =
-                CreateDeliveryStreamRequest.builder()
-                                           .deliveryStreamName(DEVLIVERY_STREAM_NAME)
-                                           .s3DestinationConfiguration(S3DestinationConfiguration.builder()
-                                                                                                 .bucketARN(FAKE_S3_BUCKET_ARN)
-                                                                                                 .roleARN(FAKE_IAM_ROLE_ARN)
-                                                                                                 .build())
-                                           .build();
-        firehose.createDeliveryStream(request);
-
-        // put record
-        String recordId = firehose.putRecord(PutRecordRequest.builder()
-                                                             .deliveryStreamName(DEVLIVERY_STREAM_NAME)
-                                                             .record(Record.builder()
-                                                                           .data(SdkBytes.fromByteArray(new byte[] {0, 1, 2}))
-                                                                           .build())
-                                                             .build()
-                                            ).recordId();
-        assertNotEmpty(recordId);
-
-        // put record batch
-        List<PutRecordBatchResponseEntry> entries = firehose.putRecordBatch(
-                PutRecordBatchRequest.builder()
-                                     .deliveryStreamName(DEVLIVERY_STREAM_NAME)
-                                     .records(Record.builder().data(SdkBytes.fromByteArray(new byte[] {0})).build(),
-                                              Record.builder().data(SdkBytes.fromByteArray(new byte[] {1})).build())
-                                     .build()
-                                                                           ).requestResponses();
-        assertEquals(2, entries.size());
-        for (PutRecordBatchResponseEntry entry : entries) {
-            if (entry.errorCode() == null) {
-                assertNotEmpty(entry.recordId());
-            } else {
-                assertNotEmpty(entry.errorMessage());
-            }
-        }
-    }
-
-    @Test
-    public void testListDeliveryStreams() {
-        ListDeliveryStreamsResponse result = firehose
-                .listDeliveryStreams(ListDeliveryStreamsRequest.builder().build());
-        assertNotNull(result.deliveryStreamNames());
-        assertNotNull(result.hasMoreDeliveryStreams());
-    }
-
-    @Test
-    public void testCreateDeliveryStream_InvalidParameter() {
-        try {
-            firehose.createDeliveryStream(CreateDeliveryStreamRequest.builder().build());
-            fail("ValidationException is expected.");
-        } catch (AwsServiceException exception) {
-            assertEquals("ValidationException", exception.awsErrorDetails().errorCode());
-            assertNotEmpty(exception.awsErrorDetails().errorMessage());
-        }
-    }
-
-}
diff --git a/services/fms/src/main/resources/codegen-resources/customization.config b/services/fms/src/main/resources/codegen-resources/customization.config
index f19e48d4287..f5fe1526e9c 100644
--- a/services/fms/src/main/resources/codegen-resources/customization.config
+++ b/services/fms/src/main/resources/codegen-resources/customization.config
@@ -1,5 +1,5 @@
 {
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "getAdminAccount",
         "getNotificationChannel",
         "listMemberAccounts",
diff --git a/services/gamelift/src/main/resources/codegen-resources/customization.config b/services/gamelift/src/main/resources/codegen-resources/customization.config
index dae30876df4..b7c812e1368 100644
--- a/services/gamelift/src/main/resources/codegen-resources/customization.config
+++ b/services/gamelift/src/main/resources/codegen-resources/customization.config
@@ -5,7 +5,7 @@
     // with STS's naming of a similar shape.
     "AwsCredentials" : "Credentials"
   },
-  "blacklistedSimpleMethods" : [
+  "excludedSimpleMethods" : [
     "createBuild",
     "searchGameSessions",
     "describePlayerSessions",
diff --git a/services/globalaccelerator/src/main/resources/codegen-resources/customization.config b/services/globalaccelerator/src/main/resources/codegen-resources/customization.config
index f35548b15b2..52f3ddd37a7 100644
--- a/services/globalaccelerator/src/main/resources/codegen-resources/customization.config
+++ b/services/globalaccelerator/src/main/resources/codegen-resources/customization.config
@@ -3,7 +3,7 @@
     "listAccelerators"
   ],
   "defaultSimpleMethodTestRegion": "US_WEST_2",
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "describeAcceleratorAttributes"
   ]
 }
diff --git a/services/glue/src/main/resources/codegen-resources/customization.config b/services/glue/src/main/resources/codegen-resources/customization.config
index 6abaf75b14b..e5d2b586984 100644
--- a/services/glue/src/main/resources/codegen-resources/customization.config
+++ b/services/glue/src/main/resources/codegen-resources/customization.config
@@ -1,3 +1,3 @@
 {
-  "blacklistedSimpleMethods" : ["*"]
+  "excludedSimpleMethods" : ["*"]
 }
diff --git a/services/greengrass/src/main/resources/codegen-resources/customization.config b/services/greengrass/src/main/resources/codegen-resources/customization.config
index 431c9590330..85d0fe29ba9 100644
--- a/services/greengrass/src/main/resources/codegen-resources/customization.config
+++ b/services/greengrass/src/main/resources/codegen-resources/customization.config
@@ -12,7 +12,7 @@
     "listResourceDefinitions",
     "listSubscriptionDefinitions"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "associateServiceRoleToAccount",
     "createCoreDefinition",
     "createConnectorDefinition",
diff --git a/services/guardduty/src/main/resources/codegen-resources/customization.config b/services/guardduty/src/main/resources/codegen-resources/customization.config
index 85c8c09b6c4..3d541f6b5b2 100644
--- a/services/guardduty/src/main/resources/codegen-resources/customization.config
+++ b/services/guardduty/src/main/resources/codegen-resources/customization.config
@@ -4,7 +4,7 @@
     "listDetectors",
     "listInvitations"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "createDetector",
     "declineInvitations",
     "deleteInvitations"
diff --git a/services/iam/src/main/resources/codegen-resources/customization.config b/services/iam/src/main/resources/codegen-resources/customization.config
index 0f65ae3b4f9..78b7c2df70e 100644
--- a/services/iam/src/main/resources/codegen-resources/customization.config
+++ b/services/iam/src/main/resources/codegen-resources/customization.config
@@ -26,7 +26,7 @@
     "getAccountAuthorizationDetails",
     "listPolicies"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "updateAccountPasswordPolicy"
   ],
   "excludeClientCreateMethod": true,
diff --git a/services/iot/src/main/resources/codegen-resources/customization.config b/services/iot/src/main/resources/codegen-resources/customization.config
index 9f910afc97f..bc16e09001e 100644
--- a/services/iot/src/main/resources/codegen-resources/customization.config
+++ b/services/iot/src/main/resources/codegen-resources/customization.config
@@ -30,7 +30,7 @@
     "listThings",
     "listTopicRules"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "addThingToThingGroup",
     "removeThingFromThingGroup",
     "setV2LoggingOptions",
diff --git a/services/iot1clickdevices/src/main/resources/codegen-resources/customization.config b/services/iot1clickdevices/src/main/resources/codegen-resources/customization.config
index 0bed30b4797..b947f5dbc95 100644
--- a/services/iot1clickdevices/src/main/resources/codegen-resources/customization.config
+++ b/services/iot1clickdevices/src/main/resources/codegen-resources/customization.config
@@ -1,5 +1,5 @@
 {
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "listDevices"
     ]
 }
diff --git a/services/iotanalytics/src/main/resources/codegen-resources/customization.config b/services/iotanalytics/src/main/resources/codegen-resources/customization.config
index 5837f8c071c..ba5ea64efd7 100644
--- a/services/iotanalytics/src/main/resources/codegen-resources/customization.config
+++ b/services/iotanalytics/src/main/resources/codegen-resources/customization.config
@@ -5,7 +5,7 @@
     "listDatastores",
     "listPipelines"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "describeLoggingOptions"
   ],
   "shapeModifiers": {
diff --git a/services/kinesis/src/main/resources/codegen-resources/customization.config b/services/kinesis/src/main/resources/codegen-resources/customization.config
index fdf66d583a8..caeb1f7c650 100644
--- a/services/kinesis/src/main/resources/codegen-resources/customization.config
+++ b/services/kinesis/src/main/resources/codegen-resources/customization.config
@@ -6,7 +6,7 @@
   "customServiceMetadata": {
     "protocol": "cbor"
   },
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "deregisterStreamConsumer",
     "describeStreamConsumer",
     "listShards"
diff --git a/services/kinesisanalytics/src/main/resources/codegen-resources/customization.config b/services/kinesisanalytics/src/main/resources/codegen-resources/customization.config
index 282a5331893..d1bf750d26b 100644
--- a/services/kinesisanalytics/src/main/resources/codegen-resources/customization.config
+++ b/services/kinesisanalytics/src/main/resources/codegen-resources/customization.config
@@ -2,7 +2,7 @@
   "verifiedSimpleMethods": [
     "listApplications"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "discoverInputSchema"
   ]
 }
diff --git a/services/kinesisvideo/src/main/resources/codegen-resources/customization.config b/services/kinesisvideo/src/main/resources/codegen-resources/customization.config
index becde5e5fc8..e0972ef57fe 100644
--- a/services/kinesisvideo/src/main/resources/codegen-resources/customization.config
+++ b/services/kinesisvideo/src/main/resources/codegen-resources/customization.config
@@ -2,7 +2,7 @@
   "verifiedSimpleMethods": [
     "listStreams"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "listTagsForStream",
     "describeStream"
   ]
diff --git a/services/kinesisvideoarchivedmedia/src/main/resources/codegen-resources/customization.config b/services/kinesisvideoarchivedmedia/src/main/resources/codegen-resources/customization.config
index 97db0dd1e81..232ca942ec4 100644
--- a/services/kinesisvideoarchivedmedia/src/main/resources/codegen-resources/customization.config
+++ b/services/kinesisvideoarchivedmedia/src/main/resources/codegen-resources/customization.config
@@ -1,5 +1,5 @@
 {
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "getHLSStreamingSessionURL"
     ]
 }
diff --git a/services/licensemanager/src/main/resources/codegen-resources/customization.config b/services/licensemanager/src/main/resources/codegen-resources/customization.config
index b98b012071c..cb1971ffe74 100644
--- a/services/licensemanager/src/main/resources/codegen-resources/customization.config
+++ b/services/licensemanager/src/main/resources/codegen-resources/customization.config
@@ -3,7 +3,7 @@
         "getServiceSettings",
         "listLicenseConfigurations"
     ],
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "getServiceSettings",
         "listLicenseConfigurations",
         "listResourceInventory"
diff --git a/services/macie/src/main/resources/codegen-resources/customization.config b/services/macie/src/main/resources/codegen-resources/customization.config
index 15a246df948..c0e92ca2cb1 100644
--- a/services/macie/src/main/resources/codegen-resources/customization.config
+++ b/services/macie/src/main/resources/codegen-resources/customization.config
@@ -1,5 +1,5 @@
 {
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "listMemberAccounts",
         "listS3Resources"
     ]
diff --git a/services/mediaconvert/src/main/resources/codegen-resources/customization.config b/services/mediaconvert/src/main/resources/codegen-resources/customization.config
index 6abaf75b14b..e5d2b586984 100644
--- a/services/mediaconvert/src/main/resources/codegen-resources/customization.config
+++ b/services/mediaconvert/src/main/resources/codegen-resources/customization.config
@@ -1,3 +1,3 @@
 {
-  "blacklistedSimpleMethods" : ["*"]
+  "excludedSimpleMethods" : ["*"]
 }
diff --git a/services/medialive/src/main/resources/codegen-resources/customization.config b/services/medialive/src/main/resources/codegen-resources/customization.config
index 4f122f084d3..2b6d3476b2d 100644
--- a/services/medialive/src/main/resources/codegen-resources/customization.config
+++ b/services/medialive/src/main/resources/codegen-resources/customization.config
@@ -6,7 +6,7 @@
     "listOfferings",
     "listReservations"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "createChannel",
     "createInput",
     "createInputSecurityGroup"
diff --git a/services/mediastore/src/main/resources/codegen-resources/customization.config b/services/mediastore/src/main/resources/codegen-resources/customization.config
index cc404c84d6c..933304e140c 100644
--- a/services/mediastore/src/main/resources/codegen-resources/customization.config
+++ b/services/mediastore/src/main/resources/codegen-resources/customization.config
@@ -2,7 +2,7 @@
   "verifiedSimpleMethods": [
     "listContainers"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "describeContainer"
   ]
 }
diff --git a/services/mediastoredata/src/main/resources/codegen-resources/customization.config b/services/mediastoredata/src/main/resources/codegen-resources/customization.config
index 18dafbef2ba..a5746334a29 100644
--- a/services/mediastoredata/src/main/resources/codegen-resources/customization.config
+++ b/services/mediastoredata/src/main/resources/codegen-resources/customization.config
@@ -1,5 +1,5 @@
 {
-  "blacklistedSimpleMethods" : [
+  "excludedSimpleMethods" : [
     "listItems"
   ]
 }
diff --git a/services/migrationhub/src/main/resources/codegen-resources/customization.config b/services/migrationhub/src/main/resources/codegen-resources/customization.config
index 6abaf75b14b..e5d2b586984 100644
--- a/services/migrationhub/src/main/resources/codegen-resources/customization.config
+++ b/services/migrationhub/src/main/resources/codegen-resources/customization.config
@@ -1,3 +1,3 @@
 {
-  "blacklistedSimpleMethods" : ["*"]
+  "excludedSimpleMethods" : ["*"]
 }
diff --git a/services/mobile/src/main/resources/codegen-resources/customization.config b/services/mobile/src/main/resources/codegen-resources/customization.config
index 953b9278a88..27d3c7e09b7 100644
--- a/services/mobile/src/main/resources/codegen-resources/customization.config
+++ b/services/mobile/src/main/resources/codegen-resources/customization.config
@@ -3,7 +3,7 @@
     "listBundles",
     "listProjects"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "createProject"
   ]
 }
diff --git a/services/mq/src/main/resources/codegen-resources/customization.config b/services/mq/src/main/resources/codegen-resources/customization.config
index a0dbd42cc12..fd2da26cf90 100644
--- a/services/mq/src/main/resources/codegen-resources/customization.config
+++ b/services/mq/src/main/resources/codegen-resources/customization.config
@@ -3,7 +3,7 @@
     "listBrokers",
     "listConfigurations"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "createBroker",
     "createConfiguration"
   ]
diff --git a/services/mturk/src/main/resources/codegen-resources/customization.config b/services/mturk/src/main/resources/codegen-resources/customization.config
index 1827bbb57cb..8d6cca6e6d5 100644
--- a/services/mturk/src/main/resources/codegen-resources/customization.config
+++ b/services/mturk/src/main/resources/codegen-resources/customization.config
@@ -1,5 +1,5 @@
 {
-  "blacklistedSimpleMethods" : ["listBonusPayments"],
+  "excludedSimpleMethods" : ["listBonusPayments"],
   "verifiedSimpleMethods" : [
     "listWorkerBlocks",
     "listReviewableHITs",
diff --git a/services/opsworks/src/main/resources/codegen-resources/customization.config b/services/opsworks/src/main/resources/codegen-resources/customization.config
index 197b17d901a..322f97faeed 100644
--- a/services/opsworks/src/main/resources/codegen-resources/customization.config
+++ b/services/opsworks/src/main/resources/codegen-resources/customization.config
@@ -6,7 +6,7 @@
     "describeStacks",
     "describeUserProfiles"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "updateMyUserProfile",
     "describeAgentVersions",
     "describeApps",
diff --git a/services/pinpoint/src/main/resources/codegen-resources/customization.config b/services/pinpoint/src/main/resources/codegen-resources/customization.config
index b77ce5f489b..4d02e0dff44 100644
--- a/services/pinpoint/src/main/resources/codegen-resources/customization.config
+++ b/services/pinpoint/src/main/resources/codegen-resources/customization.config
@@ -1,5 +1,5 @@
 {
-  "blacklistedSimpleMethods" : ["*"],
+  "excludedSimpleMethods" : ["*"],
   "renameShapes": {
     // Do not keep adding to this list. Require the service team to name enums like they're naming their shapes.
     "__EndpointTypesElement": "EndpointTypesElement"
diff --git a/services/pinpointemail/src/main/resources/codegen-resources/customization.config b/services/pinpointemail/src/main/resources/codegen-resources/customization.config
index 95538dcb362..6bef416549e 100644
--- a/services/pinpointemail/src/main/resources/codegen-resources/customization.config
+++ b/services/pinpointemail/src/main/resources/codegen-resources/customization.config
@@ -3,7 +3,7 @@
     "getAccount",
     "getDeliverabilityDashboardOptions"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "getDedicatedIps",
     "listConfigurationSets",
     "listDedicatedIpPools",
diff --git a/services/pinpointsmsvoice/src/main/resources/codegen-resources/customization.config b/services/pinpointsmsvoice/src/main/resources/codegen-resources/customization.config
index 03992c18dda..7bd34e37614 100644
--- a/services/pinpointsmsvoice/src/main/resources/codegen-resources/customization.config
+++ b/services/pinpointsmsvoice/src/main/resources/codegen-resources/customization.config
@@ -1,5 +1,5 @@
 {
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "listConfigurationSets"
     ]
 }
diff --git a/services/pricing/src/main/resources/codegen-resources/customization.config b/services/pricing/src/main/resources/codegen-resources/customization.config
index 6aad4b5fe48..55e49fef5fa 100644
--- a/services/pricing/src/main/resources/codegen-resources/customization.config
+++ b/services/pricing/src/main/resources/codegen-resources/customization.config
@@ -2,7 +2,7 @@
   "verifiedSimpleMethods": [
     "describeServices"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "getProducts"
   ]
 }
diff --git a/services/rds/src/main/resources/codegen-resources/customization.config b/services/rds/src/main/resources/codegen-resources/customization.config
index 547a01d77f0..fa6c19c9353 100644
--- a/services/rds/src/main/resources/codegen-resources/customization.config
+++ b/services/rds/src/main/resources/codegen-resources/customization.config
@@ -56,7 +56,7 @@
             ]
         }
     },
-    "blacklistedSimpleMethods" : ["failoverDBCluster"],
+    "excludedSimpleMethods" : ["failoverDBCluster"],
     "deprecatedShapes" : [
         "BackupPolicyNotFoundFault"
     ],
diff --git a/services/redshift/src/main/resources/codegen-resources/customization.config b/services/redshift/src/main/resources/codegen-resources/customization.config
index a15637c838c..635247225c3 100644
--- a/services/redshift/src/main/resources/codegen-resources/customization.config
+++ b/services/redshift/src/main/resources/codegen-resources/customization.config
@@ -21,7 +21,7 @@
     "describeStorage",
     "describeTags"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "describeTableRestoreStatus",
     "describeClusterSecurityGroups"
   ]
diff --git a/services/rekognition/src/main/resources/codegen-resources/customization.config b/services/rekognition/src/main/resources/codegen-resources/customization.config
index 77a06980da8..ece3c940cc7 100644
--- a/services/rekognition/src/main/resources/codegen-resources/customization.config
+++ b/services/rekognition/src/main/resources/codegen-resources/customization.config
@@ -3,7 +3,7 @@
     "listCollections",
     "listStreamProcessors"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "describeTableRestoreStatus",
     "describeClusterSecurityGroups"
   ]
diff --git a/services/route53domains/src/main/resources/codegen-resources/customization.config b/services/route53domains/src/main/resources/codegen-resources/customization.config
index df62beb2be1..cbc750ecf2c 100644
--- a/services/route53domains/src/main/resources/codegen-resources/customization.config
+++ b/services/route53domains/src/main/resources/codegen-resources/customization.config
@@ -4,7 +4,7 @@
     "listDomains",
     "listOperations"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "viewBilling",
     "getContactReachabilityStatus"
   ]
diff --git a/services/route53resolver/src/main/resources/codegen-resources/customization.config b/services/route53resolver/src/main/resources/codegen-resources/customization.config
index c06646195ea..daf08da254a 100644
--- a/services/route53resolver/src/main/resources/codegen-resources/customization.config
+++ b/services/route53resolver/src/main/resources/codegen-resources/customization.config
@@ -1,5 +1,5 @@
 {
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "listResolverEndpoints",
         "listResolverRuleAssociations",
         "listResolverRules"
diff --git a/services/securityhub/src/main/resources/codegen-resources/customization.config b/services/securityhub/src/main/resources/codegen-resources/customization.config
index 045846615ab..4f8246fb980 100644
--- a/services/securityhub/src/main/resources/codegen-resources/customization.config
+++ b/services/securityhub/src/main/resources/codegen-resources/customization.config
@@ -9,7 +9,7 @@
     "listInvitations",
     "listMembers"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "getEnabledStandards",
     "getInsights"
   ]
diff --git a/services/serverlessapplicationrepository/src/main/resources/codegen-resources/customization.config b/services/serverlessapplicationrepository/src/main/resources/codegen-resources/customization.config
index fece2bf044f..2fb45a9d3f0 100644
--- a/services/serverlessapplicationrepository/src/main/resources/codegen-resources/customization.config
+++ b/services/serverlessapplicationrepository/src/main/resources/codegen-resources/customization.config
@@ -1,4 +1,4 @@
 {
-  "blacklistedSimpleMethods" : ["createApplication"],
+  "excludedSimpleMethods" : ["createApplication"],
   "verifiedSimpleMethods" : ["listApplications"]
 }
diff --git a/services/ses/src/main/resources/codegen-resources/customization.config b/services/ses/src/main/resources/codegen-resources/customization.config
index 9c5a65cc95b..232f5a35cdb 100644
--- a/services/ses/src/main/resources/codegen-resources/customization.config
+++ b/services/ses/src/main/resources/codegen-resources/customization.config
@@ -13,7 +13,7 @@
     "listTemplates",
     "listVerifiedEmailAddresses"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "updateAccountSendingEnabled"
   ]
 }
diff --git a/services/shield/src/main/resources/codegen-resources/customization.config b/services/shield/src/main/resources/codegen-resources/customization.config
index 3beb25f9846..541a64eac33 100644
--- a/services/shield/src/main/resources/codegen-resources/customization.config
+++ b/services/shield/src/main/resources/codegen-resources/customization.config
@@ -8,7 +8,7 @@
     "listAttacks",
     "getSubscriptionState"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "updateEmergencyContactSettings",
     "updateSubscription",
     "describeDRTAccess",
diff --git a/services/snowball/src/main/resources/codegen-resources/customization.config b/services/snowball/src/main/resources/codegen-resources/customization.config
index d6daf2b5dc0..50142bb8bc8 100644
--- a/services/snowball/src/main/resources/codegen-resources/customization.config
+++ b/services/snowball/src/main/resources/codegen-resources/customization.config
@@ -17,7 +17,7 @@
       ]
     }
   },
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "createJob"
   ]
 }
diff --git a/services/ssm/src/main/resources/codegen-resources/customization.config b/services/ssm/src/main/resources/codegen-resources/customization.config
index 6d66b0458a9..0f8e54aef31 100644
--- a/services/ssm/src/main/resources/codegen-resources/customization.config
+++ b/services/ssm/src/main/resources/codegen-resources/customization.config
@@ -20,7 +20,7 @@
     "listResourceComplianceSummaries",
     "listResourceDataSync"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "deleteAssociation",
     "describeAssociation",
     "listComplianceItems",
diff --git a/services/support/src/main/resources/codegen-resources/customization.config b/services/support/src/main/resources/codegen-resources/customization.config
index 6c7177e16e0..62198e1a488 100644
--- a/services/support/src/main/resources/codegen-resources/customization.config
+++ b/services/support/src/main/resources/codegen-resources/customization.config
@@ -1,5 +1,5 @@
 {
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "resolveCase",
         "describeSeverityLevels",
         "describeCases",
diff --git a/services/waf/src/main/resources/codegen-resources/waf/customization.config b/services/waf/src/main/resources/codegen-resources/waf/customization.config
index 8da5cd6c947..23503733d43 100644
--- a/services/waf/src/main/resources/codegen-resources/waf/customization.config
+++ b/services/waf/src/main/resources/codegen-resources/waf/customization.config
@@ -1,5 +1,5 @@
 {
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "listActivatedRulesInRuleGroup",
         "listLoggingConfigurations"
     ],
diff --git a/services/waf/src/main/resources/codegen-resources/wafregional/customization.config b/services/waf/src/main/resources/codegen-resources/wafregional/customization.config
index c2cd16ad4d6..e8d7cb99166 100644
--- a/services/waf/src/main/resources/codegen-resources/wafregional/customization.config
+++ b/services/waf/src/main/resources/codegen-resources/wafregional/customization.config
@@ -6,7 +6,7 @@
     },
     "sdkRequestBaseClassName": "WafRequest",
     "sdkResponseBaseClassName": "WafResponse",
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "listActivatedRulesInRuleGroup",
         "listLoggingConfigurations"
     ],
diff --git a/services/workdocs/src/main/resources/codegen-resources/customization.config b/services/workdocs/src/main/resources/codegen-resources/customization.config
index 59ace42147e..304bdf6f931 100644
--- a/services/workdocs/src/main/resources/codegen-resources/customization.config
+++ b/services/workdocs/src/main/resources/codegen-resources/customization.config
@@ -1,5 +1,5 @@
 {
-  "blacklistedSimpleMethods" : [
+  "excludedSimpleMethods" : [
     "describeUsers",
     "describeActivities",
     "getResources"
diff --git a/services/workspaces/src/main/resources/codegen-resources/customization.config b/services/workspaces/src/main/resources/codegen-resources/customization.config
index 8ed4e567f57..ab497503791 100644
--- a/services/workspaces/src/main/resources/codegen-resources/customization.config
+++ b/services/workspaces/src/main/resources/codegen-resources/customization.config
@@ -7,7 +7,7 @@
     "describeWorkspaces",
     "describeWorkspacesConnectionStatus"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "describeAccountModifications",
     "describeAccount"
   ]
diff --git a/services/xray/src/main/resources/codegen-resources/customization.config b/services/xray/src/main/resources/codegen-resources/customization.config
index 0d2f3c58141..323772188ef 100644
--- a/services/xray/src/main/resources/codegen-resources/customization.config
+++ b/services/xray/src/main/resources/codegen-resources/customization.config
@@ -5,7 +5,7 @@
     "getSamplingRules",
     "getSamplingStatisticSummaries"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "deleteSamplingRule",
     "getGroup"
   ],