diff --git a/Sources/ApolloCodegenLib/ApolloCodegenOptions.swift b/Sources/ApolloCodegenLib/ApolloCodegenOptions.swift
index 4b05aaf0c3..0d699aece6 100644
--- a/Sources/ApolloCodegenLib/ApolloCodegenOptions.swift
+++ b/Sources/ApolloCodegenLib/ApolloCodegenOptions.swift
@@ -130,7 +130,7 @@ public struct ApolloCodegenOptions {
   public init(targetRootURL folder: URL,
               codegenEngine: CodeGenerationEngine = .default,
               downloadTimeout: Double = 30.0) {
-    let schema = folder.appendingPathComponent("schema.json")
+    let schema = folder.appendingPathComponent("schema.graphqls")
     
     let outputFileURL: URL
     switch codegenEngine {
diff --git a/Tests/ApolloCodegenTests/ApolloSchemaInternalTests.swift b/Tests/ApolloCodegenTests/ApolloSchemaInternalTests.swift
index 6c40d45bb4..8efd7c5fcf 100644
--- a/Tests/ApolloCodegenTests/ApolloSchemaInternalTests.swift
+++ b/Tests/ApolloCodegenTests/ApolloSchemaInternalTests.swift
@@ -27,5 +27,13 @@ class ApolloSchemaInternalTests: XCTestCase {
     let postType = try schema.getType(named: "Post")
     XCTAssertEqual(postType?.name, "Post")
   }
+
+  func testConfiguration_usingOnlyOutputFolders_shouldGenerateCompatibleFilenames() {
+    let downloadConfiguration = ApolloSchemaDownloadConfiguration(using: .introspection(endpointURL: TestURL.mockPort8080.url),
+                                                                  outputFolderURL: CodegenTestHelper.outputFolderURL())
+    let codegenOptions = ApolloCodegenOptions(targetRootURL: CodegenTestHelper.outputFolderURL())
+
+    XCTAssertEqual(downloadConfiguration.outputURL, codegenOptions.urlToSchemaFile)
+  }
 }