@@ -21,6 +21,7 @@ import {
   downloadFile,
   isFileNode,
   imageCDNState,
+  generateTypeName,
 } from "./normalize"
 
 import {
@@ -951,10 +952,22 @@ exports.createSchemaCustomization = (
   if (pluginOptions.skipFileDownloads && pluginOptions.imageCDN) {
     actions.createTypes([
       // polyfill so image CDN works on older versions of Gatsby
+      // this type is merged in with the inferred file__file and files types, adding Image CDN support via the gatsbyImage GraphQL field. The `RemoteFile` interface as well as the polyfill above are what add the gatsbyImage field.
       addRemoteFilePolyfillInterface(
-        // this type is merged in with the inferred file__file type, adding Image CDN support via the gatsbyImage GraphQL field. The `RemoteFile` interface as well as the polyfill above are what add the gatsbyImage field.
         schema.buildObjectType({
-          name: `file__file`,
+          name: generateTypeName(`file--file`, pluginOptions.typePrefix),
+          fields: {},
+          interfaces: [`Node`, `RemoteFile`],
+        }),
+        {
+          schema,
+          actions,
+          store,
+        }
+      ),
+      addRemoteFilePolyfillInterface(
+        schema.buildObjectType({
+          name: generateTypeName(`files`, pluginOptions.typePrefix),
           fields: {},
           interfaces: [`Node`, `RemoteFile`],
         }),