diff --git a/pkg/server/api/connect/v1/audit_log.resolvers.go b/pkg/server/api/connect/v1/audit_log_resolvers.go
similarity index 100%
rename from pkg/server/api/connect/v1/audit_log.resolvers.go
rename to pkg/server/api/connect/v1/audit_log_resolvers.go
diff --git a/pkg/server/api/connect/v1/base.resolvers.go b/pkg/server/api/connect/v1/base_resolvers.go
similarity index 100%
rename from pkg/server/api/connect/v1/base.resolvers.go
rename to pkg/server/api/connect/v1/base_resolvers.go
diff --git a/pkg/server/api/connect/v1/gqlgen.yaml b/pkg/server/api/connect/v1/gqlgen.yaml
index 80847b026..3ab6b280a 100644
--- a/pkg/server/api/connect/v1/gqlgen.yaml
+++ b/pkg/server/api/connect/v1/gqlgen.yaml
@@ -14,7 +14,7 @@ resolver:
   layout: "follow-schema"
   dir: "."
   package: "connect_v1"
-  filename_template: "{name}.resolvers.go"
+  filename_template: "{name}_resolvers.go"
 
 autobind: []
 call_argument_directives_with_null: true
diff --git a/pkg/server/api/connect/v1/identity.resolvers.go b/pkg/server/api/connect/v1/identity_resolvers.go
similarity index 100%
rename from pkg/server/api/connect/v1/identity.resolvers.go
rename to pkg/server/api/connect/v1/identity_resolvers.go
diff --git a/pkg/server/api/connect/v1/organization.resolvers.go b/pkg/server/api/connect/v1/organization_resolvers.go
similarity index 100%
rename from pkg/server/api/connect/v1/organization.resolvers.go
rename to pkg/server/api/connect/v1/organization_resolvers.go
diff --git a/pkg/server/api/connect/v1/personal_api_key.resolvers.go b/pkg/server/api/connect/v1/personal_api_key_resolvers.go
similarity index 100%
rename from pkg/server/api/connect/v1/personal_api_key.resolvers.go
rename to pkg/server/api/connect/v1/personal_api_key_resolvers.go
diff --git a/pkg/server/api/connect/v1/profile.resolvers.go b/pkg/server/api/connect/v1/profile_resolvers.go
similarity index 100%
rename from pkg/server/api/connect/v1/profile.resolvers.go
rename to pkg/server/api/connect/v1/profile_resolvers.go
diff --git a/pkg/server/api/connect/v1/saml.resolvers.go b/pkg/server/api/connect/v1/saml_resolvers.go
similarity index 100%
rename from pkg/server/api/connect/v1/saml.resolvers.go
rename to pkg/server/api/connect/v1/saml_resolvers.go
diff --git a/pkg/server/api/connect/v1/scim.resolvers.go b/pkg/server/api/connect/v1/scim_resolvers.go
similarity index 100%
rename from pkg/server/api/connect/v1/scim.resolvers.go
rename to pkg/server/api/connect/v1/scim_resolvers.go
diff --git a/pkg/server/api/connect/v1/session.resolvers.go b/pkg/server/api/connect/v1/session_resolvers.go
similarity index 100%
rename from pkg/server/api/connect/v1/session.resolvers.go
rename to pkg/server/api/connect/v1/session_resolvers.go
diff --git a/pkg/server/api/console/v1/CLAUDE.md b/pkg/server/api/console/v1/CLAUDE.md
index d928142e6..0a370dc2c 100644
--- a/pkg/server/api/console/v1/CLAUDE.md
+++ b/pkg/server/api/console/v1/CLAUDE.md
@@ -10,7 +10,7 @@ GraphQL API using `gqlgen`. Schema-first approach.
 | `gqlgen.yaml` | Hand-written | Codegen config |
 | `resolver.go` | Hand-written | Root `Resolver` struct and `NewMux` |
 | `graphql_handler.go` | Hand-written | Handler setup |
-| `*.resolvers.go` | Generated stubs | Per-entity resolver files (edit the bodies) |
+| `*_resolvers.go` | Generated stubs | Per-entity resolver files (edit the bodies) |
 | `schema/schema.go` | **Generated — DO NOT EDIT** | Executable schema |
 | `types/types.go` | **Generated — DO NOT EDIT** | Type definitions |
 
diff --git a/pkg/server/api/console/v1/access_review_campaign.resolvers.go b/pkg/server/api/console/v1/access_review_campaign_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/access_review_campaign.resolvers.go
rename to pkg/server/api/console/v1/access_review_campaign_resolvers.go
diff --git a/pkg/server/api/console/v1/asset.resolvers.go b/pkg/server/api/console/v1/asset_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/asset.resolvers.go
rename to pkg/server/api/console/v1/asset_resolvers.go
diff --git a/pkg/server/api/console/v1/audit_log.resolvers.go b/pkg/server/api/console/v1/audit_log_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/audit_log.resolvers.go
rename to pkg/server/api/console/v1/audit_log_resolvers.go
diff --git a/pkg/server/api/console/v1/audit.resolvers.go b/pkg/server/api/console/v1/audit_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/audit.resolvers.go
rename to pkg/server/api/console/v1/audit_resolvers.go
diff --git a/pkg/server/api/console/v1/base.resolvers.go b/pkg/server/api/console/v1/base_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/base.resolvers.go
rename to pkg/server/api/console/v1/base_resolvers.go
diff --git a/pkg/server/api/console/v1/connector.resolvers.go b/pkg/server/api/console/v1/connector_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/connector.resolvers.go
rename to pkg/server/api/console/v1/connector_resolvers.go
diff --git a/pkg/server/api/console/v1/control.resolvers.go b/pkg/server/api/console/v1/control_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/control.resolvers.go
rename to pkg/server/api/console/v1/control_resolvers.go
diff --git a/pkg/server/api/console/v1/data_protection_impact_assessment.resolvers.go b/pkg/server/api/console/v1/data_protection_impact_assessment_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/data_protection_impact_assessment.resolvers.go
rename to pkg/server/api/console/v1/data_protection_impact_assessment_resolvers.go
diff --git a/pkg/server/api/console/v1/document.resolvers.go b/pkg/server/api/console/v1/document_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/document.resolvers.go
rename to pkg/server/api/console/v1/document_resolvers.go
diff --git a/pkg/server/api/console/v1/electronic_signature.resolvers.go b/pkg/server/api/console/v1/electronic_signature_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/electronic_signature.resolvers.go
rename to pkg/server/api/console/v1/electronic_signature_resolvers.go
diff --git a/pkg/server/api/console/v1/evidence.resolvers.go b/pkg/server/api/console/v1/evidence_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/evidence.resolvers.go
rename to pkg/server/api/console/v1/evidence_resolvers.go
diff --git a/pkg/server/api/console/v1/file.resolvers.go b/pkg/server/api/console/v1/file_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/file.resolvers.go
rename to pkg/server/api/console/v1/file_resolvers.go
diff --git a/pkg/server/api/console/v1/framework.resolvers.go b/pkg/server/api/console/v1/framework_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/framework.resolvers.go
rename to pkg/server/api/console/v1/framework_resolvers.go
diff --git a/pkg/server/api/console/v1/gqlgen.yaml b/pkg/server/api/console/v1/gqlgen.yaml
index 8b26fc1a3..a95ec7673 100644
--- a/pkg/server/api/console/v1/gqlgen.yaml
+++ b/pkg/server/api/console/v1/gqlgen.yaml
@@ -13,7 +13,7 @@ resolver:
   layout: "follow-schema"
   dir: "."
   package: "console_v1"
-  filename_template: "{name}.resolvers.go"
+  filename_template: "{name}_resolvers.go"
 
 autobind: []
 call_argument_directives_with_null: true
diff --git a/pkg/server/api/console/v1/mailing_list.resolvers.go b/pkg/server/api/console/v1/mailing_list_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/mailing_list.resolvers.go
rename to pkg/server/api/console/v1/mailing_list_resolvers.go
diff --git a/pkg/server/api/console/v1/measure.resolvers.go b/pkg/server/api/console/v1/measure_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/measure.resolvers.go
rename to pkg/server/api/console/v1/measure_resolvers.go
diff --git a/pkg/server/api/console/v1/meeting.resolvers.go b/pkg/server/api/console/v1/meeting_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/meeting.resolvers.go
rename to pkg/server/api/console/v1/meeting_resolvers.go
diff --git a/pkg/server/api/console/v1/obligation.resolvers.go b/pkg/server/api/console/v1/obligation_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/obligation.resolvers.go
rename to pkg/server/api/console/v1/obligation_resolvers.go
diff --git a/pkg/server/api/console/v1/organization.resolvers.go b/pkg/server/api/console/v1/organization_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/organization.resolvers.go
rename to pkg/server/api/console/v1/organization_resolvers.go
diff --git a/pkg/server/api/console/v1/processing_activity.resolvers.go b/pkg/server/api/console/v1/processing_activity_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/processing_activity.resolvers.go
rename to pkg/server/api/console/v1/processing_activity_resolvers.go
diff --git a/pkg/server/api/console/v1/rights_request.resolvers.go b/pkg/server/api/console/v1/rights_request_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/rights_request.resolvers.go
rename to pkg/server/api/console/v1/rights_request_resolvers.go
diff --git a/pkg/server/api/console/v1/risk.resolvers.go b/pkg/server/api/console/v1/risk_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/risk.resolvers.go
rename to pkg/server/api/console/v1/risk_resolvers.go
diff --git a/pkg/server/api/console/v1/snapshot.resolvers.go b/pkg/server/api/console/v1/snapshot_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/snapshot.resolvers.go
rename to pkg/server/api/console/v1/snapshot_resolvers.go
diff --git a/pkg/server/api/console/v1/task.resolvers.go b/pkg/server/api/console/v1/task_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/task.resolvers.go
rename to pkg/server/api/console/v1/task_resolvers.go
diff --git a/pkg/server/api/console/v1/trust_center.resolvers.go b/pkg/server/api/console/v1/trust_center_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/trust_center.resolvers.go
rename to pkg/server/api/console/v1/trust_center_resolvers.go
diff --git a/pkg/server/api/console/v1/vendor.resolvers.go b/pkg/server/api/console/v1/vendor_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/vendor.resolvers.go
rename to pkg/server/api/console/v1/vendor_resolvers.go
diff --git a/pkg/server/api/console/v1/viewer.resolvers.go b/pkg/server/api/console/v1/viewer_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/viewer.resolvers.go
rename to pkg/server/api/console/v1/viewer_resolvers.go
diff --git a/pkg/server/api/console/v1/webhook.resolvers.go b/pkg/server/api/console/v1/webhook_resolvers.go
similarity index 100%
rename from pkg/server/api/console/v1/webhook.resolvers.go
rename to pkg/server/api/console/v1/webhook_resolvers.go
diff --git a/pkg/server/api/trust/v1/auth.resolvers.go b/pkg/server/api/trust/v1/auth_resolvers.go
similarity index 100%
rename from pkg/server/api/trust/v1/auth.resolvers.go
rename to pkg/server/api/trust/v1/auth_resolvers.go
diff --git a/pkg/server/api/trust/v1/base.resolvers.go b/pkg/server/api/trust/v1/base_resolvers.go
similarity index 100%
rename from pkg/server/api/trust/v1/base.resolvers.go
rename to pkg/server/api/trust/v1/base_resolvers.go
diff --git a/pkg/server/api/trust/v1/gqlgen.yaml b/pkg/server/api/trust/v1/gqlgen.yaml
index f8764c0a1..ded75d24b 100644
--- a/pkg/server/api/trust/v1/gqlgen.yaml
+++ b/pkg/server/api/trust/v1/gqlgen.yaml
@@ -14,7 +14,7 @@ resolver:
   layout: "follow-schema"
   dir: "."
   package: "trust_v1"
-  filename_template: "{name}.resolvers.go"
+  filename_template: "{name}_resolvers.go"
 
 autobind: []
 call_argument_directives_with_null: true
diff --git a/pkg/server/api/trust/v1/mailing_list.resolvers.go b/pkg/server/api/trust/v1/mailing_list_resolvers.go
similarity index 100%
rename from pkg/server/api/trust/v1/mailing_list.resolvers.go
rename to pkg/server/api/trust/v1/mailing_list_resolvers.go
diff --git a/pkg/server/api/trust/v1/nda.resolvers.go b/pkg/server/api/trust/v1/nda_resolvers.go
similarity index 100%
rename from pkg/server/api/trust/v1/nda.resolvers.go
rename to pkg/server/api/trust/v1/nda_resolvers.go
diff --git a/pkg/server/api/trust/v1/organization.resolvers.go b/pkg/server/api/trust/v1/organization_resolvers.go
similarity index 100%
rename from pkg/server/api/trust/v1/organization.resolvers.go
rename to pkg/server/api/trust/v1/organization_resolvers.go
diff --git a/pkg/server/api/trust/v1/trust_center.resolvers.go b/pkg/server/api/trust/v1/trust_center_resolvers.go
similarity index 100%
rename from pkg/server/api/trust/v1/trust_center.resolvers.go
rename to pkg/server/api/trust/v1/trust_center_resolvers.go