diff --git a/modules/core/resources/META-INF/services/software.amazon.smithy.model.traits.TraitService b/modules/core/resources/META-INF/services/software.amazon.smithy.model.traits.TraitService
index 6358d07..ea25fcd 100644
--- a/modules/core/resources/META-INF/services/software.amazon.smithy.model.traits.TraitService
+++ b/modules/core/resources/META-INF/services/software.amazon.smithy.model.traits.TraitService
@@ -18,6 +18,8 @@ alloy.proto.ProtoNumTypeTrait$Provider
 alloy.proto.ProtoReservedFieldsTrait$Provider
 alloy.SimpleRestJsonTrait$Provider
 alloy.StructurePatternTrait$Provider
+alloy.UrlFormFlattenedTrait$Provider
+alloy.UrlFormNameTrait$Provider
 alloy.UncheckedExamplesTrait$Provider
 alloy.UntaggedUnionTrait$Provider
 alloy.UuidFormatTrait$Provider
diff --git a/modules/core/src/alloy/UrlFormFlattened.java b/modules/core/src/alloy/UrlFormFlattenedTrait.java
similarity index 84%
rename from modules/core/src/alloy/UrlFormFlattened.java
rename to modules/core/src/alloy/UrlFormFlattenedTrait.java
index 4e496e2..488da84 100644
--- a/modules/core/src/alloy/UrlFormFlattened.java
+++ b/modules/core/src/alloy/UrlFormFlattenedTrait.java
@@ -19,16 +19,16 @@
 import software.amazon.smithy.model.shapes.ShapeId;
 import software.amazon.smithy.model.traits.AnnotationTrait;
 
-public final class UrlFormFlattened extends AnnotationTrait {
+public final class UrlFormFlattenedTrait extends AnnotationTrait {
 	public static ShapeId ID = ShapeId.from("alloy#urlFormFlattened");
 
-	public UrlFormFlattened() {
+	public UrlFormFlattenedTrait() {
 		super(ID, Node.objectNode());
 	}
 
-	public static final class Provider extends AnnotationTrait.Provider<UrlFormFlattened> {
+	public static final class Provider extends AnnotationTrait.Provider<UrlFormFlattenedTrait> {
 		public Provider() {
-			super(ID, (node) -> new UrlFormFlattened());
+			super(ID, (node) -> new UrlFormFlattenedTrait());
 		}
 	}
 }
diff --git a/modules/core/src/alloy/UrlFormName.java b/modules/core/src/alloy/UrlFormNameTrait.java
similarity index 85%
rename from modules/core/src/alloy/UrlFormName.java
rename to modules/core/src/alloy/UrlFormNameTrait.java
index 2fed88a..71f0eaa 100644
--- a/modules/core/src/alloy/UrlFormName.java
+++ b/modules/core/src/alloy/UrlFormNameTrait.java
@@ -19,16 +19,16 @@
 import software.amazon.smithy.model.shapes.ShapeId;
 import software.amazon.smithy.model.traits.AnnotationTrait;
 
-public final class UrlFormName extends AnnotationTrait {
+public final class UrlFormNameTrait extends AnnotationTrait {
 	public static ShapeId ID = ShapeId.from("alloy#urlFormName");
 
-	public UrlFormName() {
+	public UrlFormNameTrait() {
 		super(ID, Node.objectNode());
 	}
 
-	public static final class Provider extends AnnotationTrait.Provider<UrlFormName> {
+	public static final class Provider extends AnnotationTrait.Provider<UrlFormNameTrait> {
 		public Provider() {
-			super(ID, (node) -> new UrlFormName());
+			super(ID, (node) -> new UrlFormNameTrait());
 		}
 	}
 }