@@ -207,9 +207,7 @@ func createRun(opts *CreateOptions) (err error) {
 
 				if template != nil {
 					templateContent = string(template.Body())
-					if ok, _ := tpl.HasAPI(); ok {
-						templateNameForSubmit = template.Name()
-					}
+					templateNameForSubmit = template.NameForSubmit()
 				} else {
 					templateContent = string(tpl.LegacyBody())
 				}
 
@@ -27,6 +27,10 @@ func (t *issueTemplate) Name() string {
 	return t.Gname
 }
 
+func (t *issueTemplate) NameForSubmit() string {
+	return t.Gname
+}
+
 func (t *issueTemplate) Body() []byte {
 	return []byte(t.Gbody)
 }
@@ -95,6 +99,7 @@ func hasIssueTemplateSupport(httpClient *http.Client, hostname string) (bool, er
 
 type Template interface {
 	Name() string
+	NameForSubmit() string
 	Body() []byte
 }
 
@@ -123,7 +128,7 @@ func NewTemplateManager(httpClient *http.Client, repo ghrepo.Interface, dir stri
 	}
 }
 
-func (m *templateManager) HasAPI() (bool, error) {
+func (m *templateManager) hasAPI() (bool, error) {
 	if m.isPR {
 		return false, nil
 	}
@@ -190,7 +195,7 @@ func (m *templateManager) memoizedFetch() error {
 }
 
 func (m *templateManager) fetch() error {
-	hasAPI, err := m.HasAPI()
+	hasAPI, err := m.hasAPI()
 	if err != nil {
 		return err
 	}
@@ -247,6 +252,10 @@ func (t *filesystemTemplate) Name() string {
 	return githubtemplate.ExtractName(t.path)
 }
 
+func (t *filesystemTemplate) NameForSubmit() string {
+	return ""
+}
+
 func (t *filesystemTemplate) Body() []byte {
 	return githubtemplate.ExtractContents(t.path)
 }
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,10 @@ func (t *issueTemplate) Name() string {`
`27`	`27`	`return t.Gname`
`28`	`28`	`}`
`29`	`29`
	`30`	`+func (t *issueTemplate) NameForSubmit() string {`
	`31`	`+ return t.Gname`
	`32`	`+}`
	`33`	`+`
`30`	`34`	`func (t *issueTemplate) Body() []byte {`
`31`	`35`	`return []byte(t.Gbody)`
`32`	`36`	`}`
`@@ -95,6 +99,7 @@ func hasIssueTemplateSupport(httpClient *http.Client, hostname string) (bool, er`
`95`	`99`
`96`	`100`	`type Template interface {`
`97`	`101`	`Name() string`
	`102`	`+ NameForSubmit() string`
`98`	`103`	`Body() []byte`
`99`	`104`	`}`
`100`	`105`
`@@ -123,7 +128,7 @@ func NewTemplateManager(httpClient *http.Client, repo ghrepo.Interface, dir stri`
`123`	`128`	`}`
`124`	`129`	`}`
`125`	`130`
`126`		`-func (m *templateManager) HasAPI() (bool, error) {`
	`131`	`+func (m *templateManager) hasAPI() (bool, error) {`
`127`	`132`	`if m.isPR {`
`128`	`133`	`return false, nil`
`129`	`134`	`}`
`@@ -190,7 +195,7 @@ func (m *templateManager) memoizedFetch() error {`
`190`	`195`	`}`
`191`	`196`
`192`	`197`	`func (m *templateManager) fetch() error {`
`193`		`- hasAPI, err := m.HasAPI()`
	`198`	`+ hasAPI, err := m.hasAPI()`
`194`	`199`	`if err != nil {`
`195`	`200`	`return err`
`196`	`201`	`}`
`@@ -247,6 +252,10 @@ func (t *filesystemTemplate) Name() string {`
`247`	`252`	`return githubtemplate.ExtractName(t.path)`
`248`	`253`	`}`
`249`	`254`
	`255`	`+func (t *filesystemTemplate) NameForSubmit() string {`
	`256`	`+ return ""`
	`257`	`+}`
	`258`	`+`
`250`	`259`	`func (t *filesystemTemplate) Body() []byte {`
`251`	`260`	`return githubtemplate.ExtractContents(t.path)`
`252`	`261`	`}`