diff --git a/build-tools/src/main/resources/software/amazon/awssdk/checkstyle.xml b/build-tools/src/main/resources/software/amazon/awssdk/checkstyle.xml
index 783d61377a20..30f72ec4bad2 100644
--- a/build-tools/src/main/resources/software/amazon/awssdk/checkstyle.xml
+++ b/build-tools/src/main/resources/software/amazon/awssdk/checkstyle.xml
@@ -45,6 +45,8 @@
 
     <module name="TreeWalker">
 
+        <module name="PackageDeclaration"/>
+
         <!-- Allow suppressing rules via comments. -->
         <module name="SuppressionCommentFilter"/>
 
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/AuthSchemeGeneratorTasks.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/AuthSchemeGeneratorTasks.java
index 38c170898f27..4b6719cc709c 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/AuthSchemeGeneratorTasks.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/AuthSchemeGeneratorTasks.java
@@ -81,7 +81,8 @@ private GeneratorTask generateEndpointBasedProvider() {
     }
 
     private GeneratorTask generateEndpointAwareAuthSchemeParams() {
-        return new PoetGeneratorTask(authSchemeDir(), model.getFileHeader(), new EndpointAwareAuthSchemeParamsSpec(model));
+        return new PoetGeneratorTask(authSchemeInternalDir(), model.getFileHeader(),
+                                     new EndpointAwareAuthSchemeParamsSpec(model));
 
     }
 
diff --git a/utils-lite/src/test/java/software/amazon/awssdk/utilslite/ThreadStorageTest.java b/utils-lite/src/test/java/software/amazon/awssdk/utilslite/SdkInternalThreadLocalTest.java
similarity index 100%
rename from utils-lite/src/test/java/software/amazon/awssdk/utilslite/ThreadStorageTest.java
rename to utils-lite/src/test/java/software/amazon/awssdk/utilslite/SdkInternalThreadLocalTest.java