diff --git a/_config.yml b/_config.yml
index 6dc73fa0bfa7..640b0f7b09ba 100644
--- a/_config.yml
+++ b/_config.yml
@@ -31,12 +31,12 @@ defaults:
 
 taps:
   core:
-    repo: core
+    repository: core
     name: Homebrew/core
     fullname: Homebrew/homebrew-core
     remote: https://github.com/Homebrew/homebrew-core
   cask:
-    repo: cask
+    repository: cask
     name: Homebrew/cask
     fullname: Homebrew/homebrew-cask
     remote: https://github.com/Homebrew/homebrew-cask
@@ -61,22 +61,22 @@ analytics:
 # sync with Library/Homebrew/deprecate_disable.rb
 reasons:
   formula:
-    does_not_build:      "does not build"
-    no_license:          "has no license"
-    repo_archived:       "has an archived upstream repository"
-    repo_removed:        "has a removed upstream repository"
-    unmaintained:        "is not maintained upstream"
-    unsupported:         "is not supported upstream"
+    does_not_build: "does not build"
+    no_license: "has no license"
+    repo_archived: "has an archived upstream repository"
+    repo_removed: "has a removed upstream repository"
+    unmaintained: "is not maintained upstream"
+    unsupported: "is not supported upstream"
     deprecated_upstream: "is deprecated upstream"
-    versioned_formula:   "is a versioned formula"
-    checksum_mismatch:   "was built with an initially released source file that had a different checksum than the current one"
+    versioned_formula: "is a versioned formula"
+    checksum_mismatch: "was built with an initially released source file that had a different checksum than the current one"
   cask:
-    discontinued:             "is discontinued upstream"
-    moved_to_mas:             "is now exclusively distributed on the Mac App Store"
-    no_longer_available:      "is no longer available upstream"
+    discontinued: "is discontinued upstream"
+    moved_to_mas: "is now exclusively distributed on the Mac App Store"
+    no_longer_available: "is no longer available upstream"
     no_longer_meets_criteria: "no longer meets the criteria for acceptable casks"
-    unmaintained:             "is not maintained upstream"
-    unsigned:                 "is unsigned or does not meet signature requirements"
+    unmaintained: "is not maintained upstream"
+    unsigned: "is unsigned or does not meet signature requirements"
 
 logo: /assets/img/homebrew.svg
 
diff --git a/cask-font_index.html b/cask-font_index.html
index e641b053a72b..25173fb7ba3e 100644
--- a/cask-font_index.html
+++ b/cask-font_index.html
@@ -3,7 +3,7 @@
 layout: default
 permalink: /cask-font/
 ---
-<p>This is a listing of all fonts available from the <a href="{{ site.taps.cask.remote }}">{{ site.taps.cask.repo }} tap</a> via the <a href="https://brew.sh">Homebrew</a> package manager for macOS.</p>
+<p>This is a listing of all fonts available from the <a href="{{ site.taps.cask.remote }}">{{ site.taps.cask.repository }} tap</a> via the <a href="https://brew.sh">Homebrew</a> package manager for macOS.</p>
 
 <h2><a href="{{ site.baseurl }}/api/cask.json"><code>/api/cask.json</code> (JSON API)</a></h2>
 
diff --git a/cask_index.html b/cask_index.html
index f1db7c147a2c..16ca905ceda6 100644
--- a/cask_index.html
+++ b/cask_index.html
@@ -3,7 +3,7 @@
 layout: default
 permalink: /cask/
 ---
-<p>This is a listing of all casks available from the <a href="{{ site.taps.cask.remote }}">{{ site.taps.cask.repo }} tap</a> via the <a href="https://brew.sh">Homebrew</a> package manager for macOS.</p>
+<p>This is a listing of all casks available from the <a href="{{ site.taps.cask.remote }}">{{ site.taps.cask.repository }} tap</a> via the <a href="https://brew.sh">Homebrew</a> package manager for macOS.</p>
 
 <h2><a href="{{ site.baseurl }}/api/cask.json"><code>/api/cask.json</code> (JSON API)</a></h2>
 
diff --git a/docs/api.md b/docs/api.md
index 7115904b284d..fac48855c192 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -90,9 +90,9 @@ GET https://formulae.brew.sh/api/analytics/${CATEGORY}/homebrew-core/${DAYS}.jso
 #### Variables
 
 - `${CATEGORY}`: the analytics event category, i.e.
-  - `install`: the installation of all {{ site.taps.core.repo }} formulae
-  - `install-on-request`: the requested installation of all {{ site.taps.core.repo }} formulae (i.e. not as a dependency of other formulae)
-  - `build-error`: the installation failure of all {{ site.taps.core.repo }} formulae
+  - `install`: the installation of all {{ site.taps.core.repository }} formulae
+  - `install-on-request`: the requested installation of all {{ site.taps.core.repository }} formulae (i.e. not as a dependency of other formulae)
+  - `build-error`: the installation failure of all {{ site.taps.core.repository }} formulae
     - only `${DAYS}: 30d` (30 days) is available
 - `${DAYS}`: the number of days of analytics events, i.e.
   - `30d`: 30 days
diff --git a/formula_index.html b/formula_index.html
index b1d8664bc035..bb927de8db04 100644
--- a/formula_index.html
+++ b/formula_index.html
@@ -4,7 +4,7 @@
 permalink: /formula/
 redirect_from: /formula-linux/
 ---
-<p>This is a listing of all packages available from the <a href="{{ site.taps.core.remote }}">{{ site.taps.core.repo }} tap</a> via the <a href="https://brew.sh">Homebrew</a> package manager for macOS and Linux.</p>
+<p>This is a listing of all packages available from the <a href="{{ site.taps.core.remote }}">{{ site.taps.core.repository }} tap</a> via the <a href="https://brew.sh">Homebrew</a> package manager for macOS and Linux.</p>
 
 <h2><a href="{{ site.baseurl }}/api/formula.json"><code>/api/formula.json</code> (JSON API)</a></h2>