diff --git a/src/NJsonSchema/DefaultTypeNameGenerator.cs b/src/NJsonSchema/DefaultTypeNameGenerator.cs
index d0618e3be..c34d3b9fa 100644
--- a/src/NJsonSchema/DefaultTypeNameGenerator.cs
+++ b/src/NJsonSchema/DefaultTypeNameGenerator.cs
@@ -103,6 +103,7 @@ private string GenerateAnonymousTypeName(string typeNameHint, IEnumerable<string
                 }
 
                 typeNameHint = GetLastSegment(typeNameHint)!;
+                typeNameHint = ConversionUtilities.ConvertToUpperCamelCase(typeNameHint, true);
 
                 if (typeNameHint != null &&
                     !reservedTypeNames.Contains(typeNameHint) && 
@@ -116,7 +117,7 @@ private string GenerateAnonymousTypeName(string typeNameHint, IEnumerable<string
                 do
                 {
                     count++;
-                    typeName = ConversionUtilities.ConvertToUpperCamelCase(typeNameHint + count, true);
+                    typeName = typeNameHint + count;
                 } while (reservedTypeNames.Contains(typeName));
 
                 return typeName;