diff --git a/codegen/build.gradle.kts b/codegen/build.gradle.kts
index 0a05423e7fcf..757c0872c3f7 100644
--- a/codegen/build.gradle.kts
+++ b/codegen/build.gradle.kts
@@ -125,7 +125,7 @@ subprojects {
             repositories {
                 maven {
                     name = "stagingRepository"
-                    url = uri("${rootProject.buildDir}/staging")
+                    url = rootProject.layout.buildDirectory.dir("staging").get().asFile.toURI()
                 }
             }
 
@@ -217,7 +217,9 @@ subprojects {
             reports {
                 xml.required.set(false)
                 csv.required.set(false)
-                html.outputLocation.set(file("$buildDir/reports/jacoco"))
+                html.outputLocation.set(
+                    layout.buildDirectory.dir("reports/jacoco").get().asFile
+                )
             }
         }
 
@@ -288,7 +290,9 @@ jreleaser {
                 create("maven-central") {
                     active = Active.ALWAYS
                     url = "https://central.sonatype.com/api/v1/publisher"
-                    stagingRepositories.add("${rootProject.buildDir}/staging")
+                    stagingRepositories.add(
+                        rootProject.layout.buildDirectory.dir("staging").get().asFile.absolutePath
+                    )
                 }
             }
         }
diff --git a/codegen/generic-client-test-codegen/build.gradle.kts b/codegen/generic-client-test-codegen/build.gradle.kts
index 06ecf446bbae..eebc1e8a9287 100644
--- a/codegen/generic-client-test-codegen/build.gradle.kts
+++ b/codegen/generic-client-test-codegen/build.gradle.kts
@@ -47,7 +47,7 @@ tasks["jar"].enabled = false
 // from smithy-aws-typescript-codegen.
 tasks["smithyBuildJar"].enabled = false
 
-tasks.create<SmithyBuild>("buildSdk") {
+tasks.register<SmithyBuild>("buildSdk") {
     addRuntimeClasspath = true
 }
 
diff --git a/codegen/protocol-test-codegen/build.gradle.kts b/codegen/protocol-test-codegen/build.gradle.kts
index 8c65e15e61ba..555f011f859c 100644
--- a/codegen/protocol-test-codegen/build.gradle.kts
+++ b/codegen/protocol-test-codegen/build.gradle.kts
@@ -47,7 +47,7 @@ tasks["jar"].enabled = false
 // from smithy-aws-typescript-codegen.
 tasks["smithyBuildJar"].enabled = false
 
-tasks.create<SmithyBuild>("buildSdk") {
+tasks.register<SmithyBuild>("buildSdk") {
     addRuntimeClasspath = true
 }
 
diff --git a/codegen/sdk-codegen/build.gradle.kts b/codegen/sdk-codegen/build.gradle.kts
index 8ca85d879070..ae79d1a6ae98 100644
--- a/codegen/sdk-codegen/build.gradle.kts
+++ b/codegen/sdk-codegen/build.gradle.kts
@@ -56,7 +56,7 @@ tasks["jar"].enabled = false
 // from smithy-aws-typescript-codegen.
 tasks["smithyBuildJar"].enabled = false
 
-tasks.create<SmithyBuild>("buildSdk") {
+tasks.register<SmithyBuild>("buildSdk") {
     addRuntimeClasspath = true
 }
 
@@ -96,11 +96,11 @@ tasks.register("generate-smithy-build") {
 
             val sdkId = serviceTrait.sdkId
                     .replace(" ", "-")
-                    .toLowerCase();
-            val version = service.version.toLowerCase();
+                    .lowercase();
+            val version = service.version.lowercase();
 
             val clientName = sdkId.split("-").toTypedArray()
-                    .map { it.capitalize() }
+                    .map { it.replaceFirstChar { it.uppercase() } }
                     .joinToString(separator = " ")
             var manifestOverwrites = Node.parse(
                     File("smithy-aws-typescript-codegen/src/main/resources/software/amazon/smithy/aws/typescript/codegen/package.json.template")
@@ -116,7 +116,7 @@ tasks.register("generate-smithy-build") {
                     .withMember("imports", Node.fromStrings("${models.getAbsolutePath()}${File.separator}${file.name}"))
                     .withMember("plugins", Node.objectNode()
                             .withMember("typescript-codegen", Node.objectNodeBuilder()
-                                    .withMember("package", "@aws-sdk/client-" + sdkId.toLowerCase())
+                                    .withMember("package", "@aws-sdk/client-" + sdkId.lowercase())
                                     // Note that this version is replaced by Lerna when publishing.
                                     .withMember("packageVersion", "3.0.0")
                                     .withMember("packageJson", manifestOverwrites)
@@ -128,7 +128,7 @@ tasks.register("generate-smithy-build") {
                                         useSchemaSerde.contains(serviceTrait.sdkId))
                                     .build()))
                     .build()
-            projectionsBuilder.withMember(sdkId + "." + version.toLowerCase(), projectionContents)
+            projectionsBuilder.withMember(sdkId + "." + version.lowercase(), projectionContents)
         }
 
         val buildFile = if (!(clientNameProp?.isEmpty() ?: true))
diff --git a/codegen/smithy-aws-typescript-codegen/build.gradle.kts b/codegen/smithy-aws-typescript-codegen/build.gradle.kts
index 66c9664de997..ffa9c6e09c57 100644
--- a/codegen/smithy-aws-typescript-codegen/build.gradle.kts
+++ b/codegen/smithy-aws-typescript-codegen/build.gradle.kts
@@ -53,9 +53,11 @@ dependencies {
 
 tasks.register("set-aws-sdk-versions") {
     doLast {
-        mkdir("$buildDir/generated/resources/software/amazon/smithy/aws/typescript/codegen")
-        var versionsFile =
-                file("$buildDir/generated/resources/software/amazon/smithy/aws/typescript/codegen/sdkVersions.properties")
+        mkdir(layout.buildDirectory.dir("generated/resources/software/amazon/smithy/aws/typescript/codegen").get().asFile)
+        var versionsFile = layout.buildDirectory
+            .file("generated/resources/software/amazon/smithy/aws/typescript/codegen/sdkVersions.properties")
+            .get()
+            .asFile
         versionsFile.printWriter().close()
 
         var roots = project.file("../../packages").listFiles().toMutableList() + project.file("../../clients").listFiles().toList()
@@ -77,7 +79,10 @@ tasks.register("set-aws-sdk-versions") {
 sourceSets {
     main {
         resources {
-            setSrcDirs(listOf("src/main/resources", "$buildDir/generated/resources"))
+            setSrcDirs(listOf(
+                "src/main/resources",
+                layout.buildDirectory.dir("generated/resources").get().asFile
+            ))
         }
     }
 }