diff --git a/tests/core/snapshots/execution_spec__auth-protected-without-auth.md_errors.snap b/tests/core/snapshots/auth-protected-without-auth.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__auth-protected-without-auth.md_errors.snap
rename to tests/core/snapshots/auth-protected-without-auth.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__cors-invalid-expose-headers.md_errors.snap b/tests/core/snapshots/cors-invalid-expose-headers.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__cors-invalid-expose-headers.md_errors.snap
rename to tests/core/snapshots/cors-invalid-expose-headers.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__cors-invalid-headers.md_errors.snap b/tests/core/snapshots/cors-invalid-headers.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__cors-invalid-headers.md_errors.snap
rename to tests/core/snapshots/cors-invalid-headers.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__cors-invalid-methods.md_errors.snap b/tests/core/snapshots/cors-invalid-methods.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__cors-invalid-methods.md_errors.snap
rename to tests/core/snapshots/cors-invalid-methods.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__cors-invalid-origins.md_errors.snap b/tests/core/snapshots/cors-invalid-origins.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__cors-invalid-origins.md_errors.snap
rename to tests/core/snapshots/cors-invalid-origins.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__experimental-headers-error.md_errors.snap b/tests/core/snapshots/experimental-headers-error.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__experimental-headers-error.md_errors.snap
rename to tests/core/snapshots/experimental-headers-error.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__input-type-protected-error.md_errors.snap b/tests/core/snapshots/input-type-protected-error.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__input-type-protected-error.md_errors.snap
rename to tests/core/snapshots/input-type-protected-error.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-add-field-error.md_errors.snap b/tests/core/snapshots/test-add-field-error.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-add-field-error.md_errors.snap
rename to tests/core/snapshots/test-add-field-error.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-all-blueprint-errors.md_errors.snap b/tests/core/snapshots/test-all-blueprint-errors.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-all-blueprint-errors.md_errors.snap
rename to tests/core/snapshots/test-all-blueprint-errors.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-batch-operator-post.md_errors.snap b/tests/core/snapshots/test-batch-operator-post.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-batch-operator-post.md_errors.snap
rename to tests/core/snapshots/test-batch-operator-post.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-call-operator-errors.md_errors.snap b/tests/core/snapshots/test-call-operator-errors.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-call-operator-errors.md_errors.snap
rename to tests/core/snapshots/test-call-operator-errors.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-dbl-usage-many.md_errors.snap b/tests/core/snapshots/test-dbl-usage-many.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-dbl-usage-many.md_errors.snap
rename to tests/core/snapshots/test-dbl-usage-many.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-dbl-usage.md_errors.snap b/tests/core/snapshots/test-dbl-usage.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-dbl-usage.md_errors.snap
rename to tests/core/snapshots/test-dbl-usage.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-directives-undef-null-fields.md_errors.snap b/tests/core/snapshots/test-directives-undef-null-fields.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-directives-undef-null-fields.md_errors.snap
rename to tests/core/snapshots/test-directives-undef-null-fields.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-duplicated-link.md_errors.snap b/tests/core/snapshots/test-duplicated-link.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-duplicated-link.md_errors.snap
rename to tests/core/snapshots/test-duplicated-link.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-empty-link.md_errors.snap b/tests/core/snapshots/test-empty-link.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-empty-link.md_errors.snap
rename to tests/core/snapshots/test-empty-link.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-enum-empty.md_errors.snap b/tests/core/snapshots/test-enum-empty.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-enum-empty.md_errors.snap
rename to tests/core/snapshots/test-enum-empty.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-expr-error.md_errors.snap b/tests/core/snapshots/test-expr-error.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-expr-error.md_errors.snap
rename to tests/core/snapshots/test-expr-error.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-expr-with-add-field.md_errors.snap b/tests/core/snapshots/test-expr-with-add-field.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-expr-with-add-field.md_errors.snap
rename to tests/core/snapshots/test-expr-with-add-field.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-expr-with-inline.md_errors.snap b/tests/core/snapshots/test-expr-with-inline.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-expr-with-inline.md_errors.snap
rename to tests/core/snapshots/test-expr-with-inline.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-field-already-implemented-from-Interface.md_errors.snap b/tests/core/snapshots/test-field-already-implemented-from-Interface.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-field-already-implemented-from-Interface.md_errors.snap
rename to tests/core/snapshots/test-field-already-implemented-from-Interface.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-graphqlsource-no-base-url.md_errors.snap b/tests/core/snapshots/test-graphqlsource-no-base-url.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-graphqlsource-no-base-url.md_errors.snap
rename to tests/core/snapshots/test-graphqlsource-no-base-url.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-groupby-without-batching.md_errors.snap b/tests/core/snapshots/test-groupby-without-batching.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-groupby-without-batching.md_errors.snap
rename to tests/core/snapshots/test-groupby-without-batching.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-grpc-group-by.md_errors.snap b/tests/core/snapshots/test-grpc-group-by.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-grpc-group-by.md_errors.snap
rename to tests/core/snapshots/test-grpc-group-by.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-grpc-invalid-method-format.md_errors.snap b/tests/core/snapshots/test-grpc-invalid-method-format.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-grpc-invalid-method-format.md_errors.snap
rename to tests/core/snapshots/test-grpc-invalid-method-format.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-grpc-invalid-proto-id.md_errors.snap b/tests/core/snapshots/test-grpc-invalid-proto-id.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-grpc-invalid-proto-id.md_errors.snap
rename to tests/core/snapshots/test-grpc-invalid-proto-id.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-grpc-missing-fields.md_errors.snap b/tests/core/snapshots/test-grpc-missing-fields.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-grpc-missing-fields.md_errors.snap
rename to tests/core/snapshots/test-grpc-missing-fields.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-grpc-nested-data.md_errors.snap b/tests/core/snapshots/test-grpc-nested-data.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-grpc-nested-data.md_errors.snap
rename to tests/core/snapshots/test-grpc-nested-data.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-grpc-nested-optional.md_errors.snap b/tests/core/snapshots/test-grpc-nested-optional.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-grpc-nested-optional.md_errors.snap
rename to tests/core/snapshots/test-grpc-nested-optional.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-grpc-optional.md_errors.snap b/tests/core/snapshots/test-grpc-optional.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-grpc-optional.md_errors.snap
rename to tests/core/snapshots/test-grpc-optional.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-grpc-proto-path.md_errors.snap b/tests/core/snapshots/test-grpc-proto-path.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-grpc-proto-path.md_errors.snap
rename to tests/core/snapshots/test-grpc-proto-path.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-grpc-service-method.md_errors.snap b/tests/core/snapshots/test-grpc-service-method.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-grpc-service-method.md_errors.snap
rename to tests/core/snapshots/test-grpc-service-method.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-grpc-service.md_errors.snap b/tests/core/snapshots/test-grpc-service.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-grpc-service.md_errors.snap
rename to tests/core/snapshots/test-grpc-service.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-hostname-faliure.md_errors.snap b/tests/core/snapshots/test-hostname-faliure.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-hostname-faliure.md_errors.snap
rename to tests/core/snapshots/test-hostname-faliure.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-http-with-add-field.md_errors.snap b/tests/core/snapshots/test-http-with-add-field.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-http-with-add-field.md_errors.snap
rename to tests/core/snapshots/test-http-with-add-field.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-http-with-inline.md_errors.snap b/tests/core/snapshots/test-http-with-inline.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-http-with-inline.md_errors.snap
rename to tests/core/snapshots/test-http-with-inline.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-inline-error.md_errors.snap b/tests/core/snapshots/test-inline-error.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-inline-error.md_errors.snap
rename to tests/core/snapshots/test-inline-error.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-invalid-query-in-http.md_errors.snap b/tests/core/snapshots/test-invalid-query-in-http.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-invalid-query-in-http.md_errors.snap
rename to tests/core/snapshots/test-invalid-query-in-http.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-invalid-server.md_errors.snap b/tests/core/snapshots/test-invalid-server.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-invalid-server.md_errors.snap
rename to tests/core/snapshots/test-invalid-server.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-js-multiple-scripts.md_errors.snap b/tests/core/snapshots/test-js-multiple-scripts.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-js-multiple-scripts.md_errors.snap
rename to tests/core/snapshots/test-js-multiple-scripts.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-lack-resolver.md_errors.snap b/tests/core/snapshots/test-lack-resolver.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-lack-resolver.md_errors.snap
rename to tests/core/snapshots/test-lack-resolver.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-missing-argument-on-all-resolvers.md_errors.snap b/tests/core/snapshots/test-missing-argument-on-all-resolvers.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-missing-argument-on-all-resolvers.md_errors.snap
rename to tests/core/snapshots/test-missing-argument-on-all-resolvers.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-missing-mutation-resolver.md_errors.snap b/tests/core/snapshots/test-missing-mutation-resolver.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-missing-mutation-resolver.md_errors.snap
rename to tests/core/snapshots/test-missing-mutation-resolver.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-missing-query-resolver.md_errors.snap b/tests/core/snapshots/test-missing-query-resolver.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-missing-query-resolver.md_errors.snap
rename to tests/core/snapshots/test-missing-query-resolver.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-missing-root-types.md_errors.snap b/tests/core/snapshots/test-missing-root-types.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-missing-root-types.md_errors.snap
rename to tests/core/snapshots/test-missing-root-types.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-missing-schema-query.md_errors.snap b/tests/core/snapshots/test-missing-schema-query.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-missing-schema-query.md_errors.snap
rename to tests/core/snapshots/test-missing-schema-query.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-multiple-resolvable-directives-on-field.md_errors.snap b/tests/core/snapshots/test-multiple-resolvable-directives-on-field.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-multiple-resolvable-directives-on-field.md_errors.snap
rename to tests/core/snapshots/test-multiple-resolvable-directives-on-field.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-no-base-url.md_errors.snap b/tests/core/snapshots/test-no-base-url.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-no-base-url.md_errors.snap
rename to tests/core/snapshots/test-no-base-url.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-response-header-value.md_errors.snap b/tests/core/snapshots/test-response-header-value.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-response-header-value.md_errors.snap
rename to tests/core/snapshots/test-response-header-value.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-response-headers-multi.md_errors.snap b/tests/core/snapshots/test-response-headers-multi.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-response-headers-multi.md_errors.snap
rename to tests/core/snapshots/test-response-headers-multi.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-response-headers-name.md_errors.snap b/tests/core/snapshots/test-response-headers-name.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-response-headers-name.md_errors.snap
rename to tests/core/snapshots/test-response-headers-name.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__test-undefined-query.md_errors.snap b/tests/core/snapshots/test-undefined-query.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__test-undefined-query.md_errors.snap
rename to tests/core/snapshots/test-undefined-query.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__undeclared-type-no-base-url.md_errors.snap b/tests/core/snapshots/undeclared-type-no-base-url.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__undeclared-type-no-base-url.md_errors.snap
rename to tests/core/snapshots/undeclared-type-no-base-url.md_error.snap
diff --git a/tests/core/snapshots/execution_spec__undeclared-type.md_errors.snap b/tests/core/snapshots/undeclared-type.md_error.snap
similarity index 100%
rename from tests/core/snapshots/execution_spec__undeclared-type.md_errors.snap
rename to tests/core/snapshots/undeclared-type.md_error.snap
diff --git a/tests/core/spec.rs b/tests/core/spec.rs
index f54f7b6de4..e39c3e1002 100644
--- a/tests/core/spec.rs
+++ b/tests/core/spec.rs
@@ -84,7 +84,7 @@ async fn is_sdl_error(spec: ExecutionSpec, mock_http_client: Arc<Http>) -> bool
                 let errors: Vec<SDLError> =
                     cause.as_vec().iter().map(|e| e.to_owned().into()).collect();
 
-                let snapshot_name = format!("execution_spec__{}_errors", spec.safe_name);
+                let snapshot_name = format!("{}_error", spec.safe_name);
 
                 insta::assert_json_snapshot!(snapshot_name, errors);
             }