diff --git a/benchmarks/gabe-mdx/.gitattributes b/benchmarks/gabe-fs-mdx/.gitattributes
similarity index 100%
rename from benchmarks/gabe-mdx/.gitattributes
rename to benchmarks/gabe-fs-mdx/.gitattributes
diff --git a/benchmarks/gabe-mdx/.gitignore b/benchmarks/gabe-fs-mdx/.gitignore
similarity index 100%
rename from benchmarks/gabe-mdx/.gitignore
rename to benchmarks/gabe-fs-mdx/.gitignore
diff --git a/benchmarks/gabe-mdx/.prettierrc.js b/benchmarks/gabe-fs-mdx/.prettierrc.js
similarity index 100%
rename from benchmarks/gabe-mdx/.prettierrc.js
rename to benchmarks/gabe-fs-mdx/.prettierrc.js
diff --git a/benchmarks/gabe-mdx/LICENSE b/benchmarks/gabe-fs-mdx/LICENSE
similarity index 100%
rename from benchmarks/gabe-mdx/LICENSE
rename to benchmarks/gabe-fs-mdx/LICENSE
diff --git a/benchmarks/gabe-mdx/README.md b/benchmarks/gabe-fs-mdx/README.md
similarity index 72%
rename from benchmarks/gabe-mdx/README.md
rename to benchmarks/gabe-fs-mdx/README.md
index fcdec7cefa922..87afa3226182b 100644
--- a/benchmarks/gabe-mdx/README.md
+++ b/benchmarks/gabe-fs-mdx/README.md
@@ -1,10 +1,10 @@
-# MDX Benchmark
+# Baseline Gatsby Benchmark: fs + mdx
 
-This is a baseline benchmark for tracking MDX performance in the Gabe project.
+This is a baseline benchmark site in the Gabe project.
 
-The site can generate an arbitrary amount of super simple pages. Each page has a small header, imports a file, and has two small paragraphs of random text. No images, because we want to benchmark MDX.
+This site in particular tracks MDX performance for individual files per page.
 
-This uses the local file system plugin, though we might switch to sourcing from csv since that has a more efficient internal representation (fewer `File` nodes).
+The site can generate an arbitrary amount of super simple pages. Each page has a small header, imports a file, and has two small paragraphs of random text. No images, because we want to benchmark MDX.
 
 ## Install
 
diff --git a/benchmarks/gabe-mdx/gatsby-browser.js b/benchmarks/gabe-fs-mdx/gatsby-browser.js
similarity index 100%
rename from benchmarks/gabe-mdx/gatsby-browser.js
rename to benchmarks/gabe-fs-mdx/gatsby-browser.js
diff --git a/benchmarks/gabe-mdx/gatsby-config.js b/benchmarks/gabe-fs-mdx/gatsby-config.js
similarity index 100%
rename from benchmarks/gabe-mdx/gatsby-config.js
rename to benchmarks/gabe-fs-mdx/gatsby-config.js
diff --git a/benchmarks/gabe-mdx/gatsby-node.js b/benchmarks/gabe-fs-mdx/gatsby-node.js
similarity index 100%
rename from benchmarks/gabe-mdx/gatsby-node.js
rename to benchmarks/gabe-fs-mdx/gatsby-node.js
diff --git a/benchmarks/gabe-mdx/gen.js b/benchmarks/gabe-fs-mdx/gen.js
similarity index 100%
rename from benchmarks/gabe-mdx/gen.js
rename to benchmarks/gabe-fs-mdx/gen.js
diff --git a/benchmarks/gabe-mdx/package.json b/benchmarks/gabe-fs-mdx/package.json
similarity index 85%
rename from benchmarks/gabe-mdx/package.json
rename to benchmarks/gabe-fs-mdx/package.json
index 6b215d70c823b..43f00fce2deaa 100644
--- a/benchmarks/gabe-mdx/package.json
+++ b/benchmarks/gabe-fs-mdx/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "gabe-mdx",
+  "name": "gabe-fs-mdx",
   "private": true,
-  "description": "Benchmark site for testing baseline mdx perf",
+  "description": "Benchmark site for testing baseline mdx perf with individual files per page",
   "author": "Peter van der Zee <pvdz@github>",
   "version": "0.1.0",
   "license": "MIT",
@@ -23,7 +23,9 @@
     "url": "https://github.com/gatsbyjs/gatsby/issues"
   },
   "keywords": [
-    "gatsby", "benchmark", "mdx"
+    "gatsby",
+    "benchmark",
+    "mdx"
   ],
   "dependencies": {
     "@mdx-js/mdx": "^1",
diff --git a/benchmarks/gabe-mdx/src/components/layout_1.js b/benchmarks/gabe-fs-mdx/src/components/layout_1.js
similarity index 100%
rename from benchmarks/gabe-mdx/src/components/layout_1.js
rename to benchmarks/gabe-fs-mdx/src/components/layout_1.js
diff --git a/benchmarks/gabe-mdx/src/components/layout_2.js b/benchmarks/gabe-fs-mdx/src/components/layout_2.js
similarity index 100%
rename from benchmarks/gabe-mdx/src/components/layout_2.js
rename to benchmarks/gabe-fs-mdx/src/components/layout_2.js
diff --git a/benchmarks/gabe-mdx/src/pages/index.js b/benchmarks/gabe-fs-mdx/src/pages/index.js
similarity index 100%
rename from benchmarks/gabe-mdx/src/pages/index.js
rename to benchmarks/gabe-fs-mdx/src/pages/index.js
diff --git a/benchmarks/gabe-mdx/src/templates/article.js b/benchmarks/gabe-fs-mdx/src/templates/article.js
similarity index 100%
rename from benchmarks/gabe-mdx/src/templates/article.js
rename to benchmarks/gabe-fs-mdx/src/templates/article.js
diff --git a/benchmarks/gabe-mdx/static/favicon.ico b/benchmarks/gabe-fs-mdx/static/favicon.ico
similarity index 100%
rename from benchmarks/gabe-mdx/static/favicon.ico
rename to benchmarks/gabe-fs-mdx/static/favicon.ico
diff --git a/benchmarks/gabe-mdx/styles.css b/benchmarks/gabe-fs-mdx/styles.css
similarity index 100%
rename from benchmarks/gabe-mdx/styles.css
rename to benchmarks/gabe-fs-mdx/styles.css