diff --git a/cmd/swag/main.go b/cmd/swag/main.go
index 8480c4ec8..48d83cdb5 100644
--- a/cmd/swag/main.go
+++ b/cmd/swag/main.go
@@ -160,12 +160,6 @@ var initFlags = []cli.Flag{
 		Value: false,
 		Usage: "Generate OpenAPI V3.1 spec",
 	},
-	&cli.StringFlag{
-		Name:    templateDelimsFlag,
-		Aliases: []string{"td"},
-		Value:   "",
-		Usage:   "Provide custom delimeters for Go template generation. The format is leftDelim,rightDelim. For example: \"[[,]]\"",
-	},
 	&cli.StringFlag{
 		Name:    templateDelimsFlag,
 		Aliases: []string{"td"},
diff --git a/parserv3.go b/parserv3.go
index 5027d1e43..758d56f36 100644
--- a/parserv3.go
+++ b/parserv3.go
@@ -745,9 +745,13 @@ func (p *Parser) ParseDefinitionV3(typeSpecDef *TypeSpecDef) (*SchemaV3, error)
 			definition.Spec.Extensions[enumCommentsExtension] = enumComments
 		}
 	}
+	schemaName := typeName
+	if typeSpecDef.SchemaName != "" {
+		schemaName = typeSpecDef.SchemaName
+	}
 
 	sch := SchemaV3{
-		Name:    typeName,
+		Name:    schemaName,
 		PkgPath: typeSpecDef.PkgPath,
 		Schema:  definition.Spec,
 	}