Make templates work for service with "accounts" in its name

.codegen.json

@@ -1,7 +1,7 @@
 {
     "formatter": "go run golang.org/x/tools/cmd/goimports@latest -w $FILENAMES && go fmt ./...",
     "services": {
-        ".codegen/service.go.tmpl": "cmd/{{if .IsAccounts}}account{{else}}workspace{{end}}/{{(.TrimPrefix \"account\").KebabName}}/{{(.TrimPrefix \"account\").KebabName}}.go"
+        ".codegen/service.go.tmpl": "cmd/{{if .IsAccounts}}account{{else}}workspace{{end}}/{{if .IsAccounts}}{{(.TrimPrefix \"account\").KebabName}}{{else}}{{.KebabName}}{{end}}/{{if .IsAccounts}}{{(.TrimPrefix \"account\").KebabName}}{{else}}{{.KebabName}}{{end}}.go"
     },
     "batch": {
         ".codegen/cmds-workspace.go.tmpl": "cmd/workspace/cmd.go",

.codegen/service.go.tmpl

@@ -1,6 +1,6 @@
 // Code generated from OpenAPI specs by Databricks SDK Generator. DO NOT EDIT.
 
-package {{(.TrimPrefix "account").SnakeName}}
+package {{template "ServiceSnakeName" .}}
 
 import (
     "github.com/databricks/cli/libs/cmdio"
@@ -19,7 +19,7 @@ import (
 
 {{define "service"}}
 var Cmd = &cobra.Command{
-	Use:   "{{(.TrimPrefix "account").KebabName}}",
+	Use:   "{{template "ServiceKebabName" .}}",
 	{{- if .Description }}
 	Short: `{{.Summary | without "`"}}`,
 	Long: `{{.Comment  "  " 80 | without "`"}}`,
@@ -119,7 +119,7 @@ var {{.CamelName}}Cmd = &cobra.Command{
 				if len(args) == 0 {
 					promptSpinner := cmdio.Spinner(ctx)
 					promptSpinner <- "No{{range .Request.RequiredFields}} {{.ConstantName}}{{end}} argument specified. Loading names for {{.Service.TitleName}} drop-down."
-					names, err := {{if .Service.IsAccounts}}a{{else}}w{{end}}.{{(.Service.TrimPrefix "account").PascalName}}.{{.Service.List.NamedIdMap.PascalName}}(ctx{{if .Service.List.Request}}, {{.Service.Package.Name}}.{{.Service.List.Request.PascalName}}{}{{end}})
+					names, err := {{if .Service.IsAccounts}}a{{else}}w{{end}}.{{template "ServicePascalName" .Service}}.{{.Service.List.NamedIdMap.PascalName}}(ctx{{if .Service.List.Request}}, {{.Service.Package.Name}}.{{.Service.List.Request.PascalName}}{}{{end}})
 					close(promptSpinner)
 					if err != nil {
 						return fmt.Errorf("failed to load names for {{.Service.TitleName}} drop-down. Please manually specify required arguments. Original error: %w", err)
@@ -199,7 +199,7 @@ var {{.CamelName}}Cmd = &cobra.Command{
 // end service {{.Name}}{{end}}
 
 {{- define "method-call" -}}
-		{{if .Response}}response, err :={{else}}err ={{end}} {{if .Service.IsAccounts}}a{{else}}w{{end}}.{{(.Service.TrimPrefix "account").PascalName}}.{{.PascalName}}{{if .Pagination}}All{{end}}(ctx{{if .Request}}, {{.CamelName}}Req{{end}})
+		{{if .Response}}response, err :={{else}}err ={{end}} {{if .Service.IsAccounts}}a{{else}}w{{end}}.{{template "ServicePascalName" .Service}}.{{.PascalName}}{{if .Pagination}}All{{end}}(ctx{{if .Request}}, {{.CamelName}}Req{{end}})
 		if err != nil {
 			return err
 		}
@@ -220,3 +220,15 @@ var {{.CamelName}}Cmd = &cobra.Command{
 	{{- else}}/* NOT PRIMITIVE */
 	{{- end -}}
 {{- end -}}
+
+{{- define "ServiceSnakeName" -}}
+{{if .IsAccounts }}{{(.TrimPrefix "account").SnakeName }}{{ else }}{{ .SnakeName }}{{ end }}
+{{- end -}}
+
+{{- define "ServicePascalName" -}}
+{{if .IsAccounts }}{{(.TrimPrefix "account").PascalName }}{{ else }}{{ .PascalName }}{{ end }}
+{{- end -}}
+
+{{- define "ServiceKebabName" -}}
+{{if .IsAccounts }}{{(.TrimPrefix "account").KebabName }}{{ else }}{{ .KebabName }}{{ end }}
+{{- end -}}

.gitattributes

@@ -23,6 +23,7 @@ cmd/account/users/users.go linguist-generated=true
 cmd/account/vpc-endpoints/vpc-endpoints.go linguist-generated=true
 cmd/account/workspace-assignment/workspace-assignment.go linguist-generated=true
 cmd/account/workspaces/workspaces.go linguist-generated=true
+cmd/workspace/account-access-control-proxy/account-access-control-proxy.go linguist-generated=true
 cmd/workspace/alerts/alerts.go linguist-generated=true
 cmd/workspace/catalogs/catalogs.go linguist-generated=true
 cmd/workspace/cluster-policies/cluster-policies.go linguist-generated=true