diff --git a/smithy-aws-cloudformation-traits/src/main/java/software/amazon/smithy/aws/cloudformation/traits/CfnResourceTrait.java b/smithy-aws-cloudformation-traits/src/main/java/software/amazon/smithy/aws/cloudformation/traits/CfnResourceTrait.java
index f950c275295..75a2d48b12a 100644
--- a/smithy-aws-cloudformation-traits/src/main/java/software/amazon/smithy/aws/cloudformation/traits/CfnResourceTrait.java
+++ b/smithy-aws-cloudformation-traits/src/main/java/software/amazon/smithy/aws/cloudformation/traits/CfnResourceTrait.java
@@ -25,7 +25,6 @@
 import software.amazon.smithy.model.traits.AbstractTraitBuilder;
 import software.amazon.smithy.model.traits.Trait;
 import software.amazon.smithy.utils.ListUtils;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
 /**
@@ -75,7 +74,7 @@ protected Node createNode() {
     }
 
     @Override
-    public SmithyBuilder<CfnResourceTrait> toBuilder() {
+    public Builder toBuilder() {
         return builder().sourceLocation(getSourceLocation()).name(name).additionalSchemas(additionalSchemas);
     }
 
diff --git a/smithy-aws-cloudformation/src/main/java/software/amazon/smithy/aws/cloudformation/schema/model/Handler.java b/smithy-aws-cloudformation/src/main/java/software/amazon/smithy/aws/cloudformation/schema/model/Handler.java
index e6262733fb8..9c1e6fe6b4d 100644
--- a/smithy-aws-cloudformation/src/main/java/software/amazon/smithy/aws/cloudformation/schema/model/Handler.java
+++ b/smithy-aws-cloudformation/src/main/java/software/amazon/smithy/aws/cloudformation/schema/model/Handler.java
@@ -61,7 +61,7 @@ public Node toNode() {
     }
 
     @Override
-    public SmithyBuilder<Handler> toBuilder() {
+    public Builder toBuilder() {
         return builder()
                 .permissions(permissions);
     }
diff --git a/smithy-aws-cloudformation/src/main/java/software/amazon/smithy/aws/cloudformation/schema/model/Property.java b/smithy-aws-cloudformation/src/main/java/software/amazon/smithy/aws/cloudformation/schema/model/Property.java
index 0fe013bd9db..61ccade1ecd 100644
--- a/smithy-aws-cloudformation/src/main/java/software/amazon/smithy/aws/cloudformation/schema/model/Property.java
+++ b/smithy-aws-cloudformation/src/main/java/software/amazon/smithy/aws/cloudformation/schema/model/Property.java
@@ -62,7 +62,7 @@ public Node toNode() {
     }
 
     @Override
-    public SmithyBuilder<Property> toBuilder() {
+    public Builder toBuilder() {
         return builder()
                 .insertionOrder(insertionOrder)
                 .dependencies(dependencies)
diff --git a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/Partition.java b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/Partition.java
index f0af599a732..1639133106c 100644
--- a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/Partition.java
+++ b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/Partition.java
@@ -16,7 +16,6 @@
 import software.amazon.smithy.rulesengine.language.RulesComponentBuilder;
 import software.amazon.smithy.utils.BuilderRef;
 import software.amazon.smithy.utils.ListUtils;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.SmithyUnstableApi;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
@@ -117,7 +116,7 @@ public SourceLocation getSourceLocation() {
     }
 
     @Override
-    public SmithyBuilder<Partition> toBuilder() {
+    public Builder toBuilder() {
         return new Builder(getSourceLocation())
                 .id(id)
                 .regionRegex(regionRegex)
diff --git a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/PartitionOutputs.java b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/PartitionOutputs.java
index 821f4da1d9e..7896ab6e0e8 100644
--- a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/PartitionOutputs.java
+++ b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/PartitionOutputs.java
@@ -15,7 +15,6 @@
 import software.amazon.smithy.model.node.ToNode;
 import software.amazon.smithy.rulesengine.language.RulesComponentBuilder;
 import software.amazon.smithy.utils.ListUtils;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.SmithyUnstableApi;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
@@ -142,7 +141,7 @@ public SourceLocation getSourceLocation() {
     }
 
     @Override
-    public SmithyBuilder<PartitionOutputs> toBuilder() {
+    public Builder toBuilder() {
         return new Builder(getSourceLocation())
                 .name(name)
                 .dnsSuffix(dnsSuffix)
diff --git a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/RegionOverride.java b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/RegionOverride.java
index 1fe3d4209ca..8cb4cf572e4 100644
--- a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/RegionOverride.java
+++ b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/RegionOverride.java
@@ -10,7 +10,6 @@
 import software.amazon.smithy.model.node.Node;
 import software.amazon.smithy.model.node.ToNode;
 import software.amazon.smithy.rulesengine.language.RulesComponentBuilder;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.SmithyUnstableApi;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
@@ -54,7 +53,7 @@ public SourceLocation getSourceLocation() {
     }
 
     @Override
-    public SmithyBuilder<RegionOverride> toBuilder() {
+    public Builder toBuilder() {
         return new Builder(getSourceLocation());
     }
 
diff --git a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/PartitionEndpointSpecialCase.java b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/PartitionEndpointSpecialCase.java
index 3adaefb139f..530ff50a76b 100644
--- a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/PartitionEndpointSpecialCase.java
+++ b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/PartitionEndpointSpecialCase.java
@@ -86,7 +86,7 @@ public Node toNode() {
     }
 
     @Override
-    public SmithyBuilder<PartitionEndpointSpecialCase> toBuilder() {
+    public Builder toBuilder() {
         return new Builder()
             .endpoint(endpoint)
             .region(region)
diff --git a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/PartitionSpecialCase.java b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/PartitionSpecialCase.java
index 1dc0c9a838e..2fa7c598852 100644
--- a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/PartitionSpecialCase.java
+++ b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/PartitionSpecialCase.java
@@ -72,7 +72,7 @@ public Node toNode() {
     }
 
     @Override
-    public SmithyBuilder<PartitionSpecialCase> toBuilder() {
+    public Builder toBuilder() {
         return new Builder()
             .dualStack(dualStack)
             .endpoint(endpoint)
diff --git a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/RegionSpecialCase.java b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/RegionSpecialCase.java
index 742c551ffe4..d075e213517 100644
--- a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/RegionSpecialCase.java
+++ b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/RegionSpecialCase.java
@@ -83,7 +83,7 @@ public Node toNode() {
     }
 
     @Override
-    public SmithyBuilder<RegionSpecialCase> toBuilder() {
+    public Builder toBuilder() {
         return new Builder()
             .dualStack(dualStack)
             .endpoint(endpoint)
diff --git a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/StandardPartitionalEndpointsTrait.java b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/StandardPartitionalEndpointsTrait.java
index d20319f8921..558aae739f7 100644
--- a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/StandardPartitionalEndpointsTrait.java
+++ b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/StandardPartitionalEndpointsTrait.java
@@ -17,7 +17,6 @@
 import software.amazon.smithy.model.traits.AbstractTraitBuilder;
 import software.amazon.smithy.model.traits.Trait;
 import software.amazon.smithy.utils.BuilderRef;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
 /**
@@ -78,7 +77,7 @@ protected Node createNode() {
     }
 
     @Override
-    public SmithyBuilder<StandardPartitionalEndpointsTrait> toBuilder() {
+    public Builder toBuilder() {
         return new Builder()
                 .partitionEndpointSpecialCases(partitionEndpointSpecialCases)
                 .endpointPatternType(endpointPatternType);
diff --git a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/StandardRegionalEndpointsTrait.java b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/StandardRegionalEndpointsTrait.java
index 52d9b5dd1f6..50cbabe55ea 100644
--- a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/StandardRegionalEndpointsTrait.java
+++ b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/StandardRegionalEndpointsTrait.java
@@ -16,7 +16,6 @@
 import software.amazon.smithy.model.traits.AbstractTraitBuilder;
 import software.amazon.smithy.model.traits.Trait;
 import software.amazon.smithy.utils.BuilderRef;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
 /**
@@ -84,7 +83,7 @@ protected Node createNode() {
     }
 
     @Override
-    public SmithyBuilder<StandardRegionalEndpointsTrait> toBuilder() {
+    public Builder toBuilder() {
         return new Builder()
                 .partitionSpecialCases(partitionSpecialCases)
                 .regionSpecialCases(regionSpecialCases);
diff --git a/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/HttpChecksumTrait.java b/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/HttpChecksumTrait.java
index 679792d5cec..e53456ec4e5 100644
--- a/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/HttpChecksumTrait.java
+++ b/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/HttpChecksumTrait.java
@@ -27,7 +27,6 @@
 import software.amazon.smithy.model.traits.Trait;
 import software.amazon.smithy.utils.BuilderRef;
 import software.amazon.smithy.utils.ListUtils;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.SmithyUnstableApi;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
@@ -66,7 +65,7 @@ public static Builder builder() {
     }
 
     @Override
-    public SmithyBuilder<HttpChecksumTrait> toBuilder() {
+    public Builder toBuilder() {
         return new Builder()
                 .sourceLocation(getSourceLocation())
                 .requestChecksumRequired(requestChecksumRequired)
diff --git a/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/clientendpointdiscovery/ClientDiscoveredEndpointTrait.java b/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/clientendpointdiscovery/ClientDiscoveredEndpointTrait.java
index b2d67184095..97b649d5d3f 100644
--- a/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/clientendpointdiscovery/ClientDiscoveredEndpointTrait.java
+++ b/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/clientendpointdiscovery/ClientDiscoveredEndpointTrait.java
@@ -20,7 +20,6 @@
 import software.amazon.smithy.model.shapes.ShapeId;
 import software.amazon.smithy.model.traits.AbstractTrait;
 import software.amazon.smithy.model.traits.AbstractTraitBuilder;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
 /**
@@ -63,7 +62,7 @@ protected Node createNode() {
     }
 
     @Override
-    public SmithyBuilder<ClientDiscoveredEndpointTrait> toBuilder() {
+    public Builder toBuilder() {
         return builder().sourceLocation(getSourceLocation()).required(required);
     }
 
diff --git a/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/protocols/AwsQueryErrorTrait.java b/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/protocols/AwsQueryErrorTrait.java
index 1f4430656e6..7fed70d1aac 100644
--- a/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/protocols/AwsQueryErrorTrait.java
+++ b/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/protocols/AwsQueryErrorTrait.java
@@ -74,7 +74,7 @@ protected Node createNode() {
     }
 
     @Override
-    public SmithyBuilder<AwsQueryErrorTrait> toBuilder() {
+    public Builder toBuilder() {
         return builder().code(code).httpResponseCode(httpResponseCode).sourceLocation(getSourceLocation());
     }
 
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/node/ArrayNode.java b/smithy-model/src/main/java/software/amazon/smithy/model/node/ArrayNode.java
index cbc2ad79e24..66eaad8c885 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/node/ArrayNode.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/node/ArrayNode.java
@@ -73,7 +73,7 @@ public static Builder builder() {
     }
 
     @Override
-    public SmithyBuilder<ArrayNode> toBuilder() {
+    public Builder toBuilder() {
         return new Builder().sourceLocation(getSourceLocation()).merge(this);
     }
 
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/traits/EnumValueTrait.java b/smithy-model/src/main/java/software/amazon/smithy/model/traits/EnumValueTrait.java
index 5a851781431..8d4cc498da4 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/traits/EnumValueTrait.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/traits/EnumValueTrait.java
@@ -21,7 +21,6 @@
 import software.amazon.smithy.model.node.NumberNode;
 import software.amazon.smithy.model.node.StringNode;
 import software.amazon.smithy.model.shapes.ShapeId;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
 /**
@@ -101,7 +100,7 @@ protected Node createNode() {
     }
 
     @Override
-    public SmithyBuilder<EnumValueTrait> toBuilder() {
+    public Builder toBuilder() {
         Builder builder = builder().sourceLocation(getSourceLocation());
         builder.value = value;
         return builder;
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/traits/ExamplesTrait.java b/smithy-model/src/main/java/software/amazon/smithy/model/traits/ExamplesTrait.java
index 486c51fcda1..d5d9103f2c1 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/traits/ExamplesTrait.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/traits/ExamplesTrait.java
@@ -310,7 +310,7 @@ public Node toNode() {
         }
 
         @Override
-        public SmithyBuilder<ErrorExample> toBuilder() {
+        public Builder toBuilder() {
             return builder().content(content).shapeId(shapeId);
         }
 
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/traits/RequestCompressionTrait.java b/smithy-model/src/main/java/software/amazon/smithy/model/traits/RequestCompressionTrait.java
index c8c70c0c70c..67e8d01654f 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/traits/RequestCompressionTrait.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/traits/RequestCompressionTrait.java
@@ -23,7 +23,6 @@
 import software.amazon.smithy.model.shapes.ShapeId;
 import software.amazon.smithy.utils.BuilderRef;
 import software.amazon.smithy.utils.SetUtils;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
 /**
@@ -85,7 +84,7 @@ public static Builder builder() {
     }
 
     @Override
-    public SmithyBuilder<RequestCompressionTrait> toBuilder() {
+    public Builder toBuilder() {
         return new Builder()
                 .sourceLocation(getSourceLocation())
                 .encodings(encodings);
diff --git a/smithy-model/src/test/java/software/amazon/smithy/model/node/NodeMapperTest.java b/smithy-model/src/test/java/software/amazon/smithy/model/node/NodeMapperTest.java
index d1d15729b10..66a7316485f 100644
--- a/smithy-model/src/test/java/software/amazon/smithy/model/node/NodeMapperTest.java
+++ b/smithy-model/src/test/java/software/amazon/smithy/model/node/NodeMapperTest.java
@@ -1351,7 +1351,7 @@ protected Node createNode() {
         }
 
         @Override
-        public SmithyBuilder<SourceLocationBearerTrait> toBuilder() {
+        public Builder toBuilder() {
             return new Builder().sourceLocation(getSourceLocation());
         }
 
diff --git a/smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/traits/EndpointTestOperationInput.java b/smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/traits/EndpointTestOperationInput.java
index 906268a8447..e7edcc58ef9 100644
--- a/smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/traits/EndpointTestOperationInput.java
+++ b/smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/traits/EndpointTestOperationInput.java
@@ -79,7 +79,7 @@ public int hashCode() {
     }
 
     @Override
-    public SmithyBuilder<EndpointTestOperationInput> toBuilder() {
+    public Builder toBuilder() {
         return builder()
                 .sourceLocation(sourceLocation)
                 .operationName(operationName)
diff --git a/smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/traits/ExpectedEndpoint.java b/smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/traits/ExpectedEndpoint.java
index 5c6f80c282a..baca5f3e6c2 100644
--- a/smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/traits/ExpectedEndpoint.java
+++ b/smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/traits/ExpectedEndpoint.java
@@ -56,7 +56,7 @@ public SourceLocation getSourceLocation() {
     }
 
     @Override
-    public SmithyBuilder<ExpectedEndpoint> toBuilder() {
+    public Builder toBuilder() {
         return builder()
                 .sourceLocation(sourceLocation)
                 .url(url)
diff --git a/smithy-waiters/src/main/java/software/amazon/smithy/waiters/WaitableTrait.java b/smithy-waiters/src/main/java/software/amazon/smithy/waiters/WaitableTrait.java
index 8138f85f769..21c0b393731 100644
--- a/smithy-waiters/src/main/java/software/amazon/smithy/waiters/WaitableTrait.java
+++ b/smithy-waiters/src/main/java/software/amazon/smithy/waiters/WaitableTrait.java
@@ -24,7 +24,6 @@
 import software.amazon.smithy.model.traits.Trait;
 import software.amazon.smithy.model.traits.TraitService;
 import software.amazon.smithy.utils.BuilderRef;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
 /**
@@ -47,7 +46,7 @@ public static Builder builder() {
     }
 
     @Override
-    public SmithyBuilder<WaitableTrait> toBuilder() {
+    public Builder toBuilder() {
         return new Builder().sourceLocation(getSourceLocation()).replace(waiters);
     }
 
diff --git a/smithy-waiters/src/main/java/software/amazon/smithy/waiters/Waiter.java b/smithy-waiters/src/main/java/software/amazon/smithy/waiters/Waiter.java
index 0564bbbd188..ae928c48da3 100644
--- a/smithy-waiters/src/main/java/software/amazon/smithy/waiters/Waiter.java
+++ b/smithy-waiters/src/main/java/software/amazon/smithy/waiters/Waiter.java
@@ -69,7 +69,7 @@ public static Builder builder() {
     }
 
     @Override
-    public SmithyBuilder<Waiter> toBuilder() {
+    public Builder toBuilder() {
         return builder()
                 .documentation(getDocumentation().orElse(null))
                 .acceptors(getAcceptors())