diff --git a/.github/ISSUE_TEMPLATE/Reproducible-Bug-Report.md b/.github/ISSUE_TEMPLATE/Reproducible-Bug-Report.md
index d16f68a857..439d6abb1d 100644
--- a/.github/ISSUE_TEMPLATE/Reproducible-Bug-Report.md
+++ b/.github/ISSUE_TEMPLATE/Reproducible-Bug-Report.md
@@ -7,7 +7,7 @@ about: Submit an issue so we can investigate
 **Please note we will close your issue without comment if you delete, do not read or do not fill out the issue checklist below and provide ALL the requested information. If you repeatedly fail to use the issue template, we will block you from ever submitting issues to Homebrew again.**
 
 - [ ] are reporting a bug others will be able to reproduce and not asking a question. If you're not sure or want to ask a question do so on our Discourse: https://discourse.brew.sh
-- [ ] ran a `brew` command and reproduced the problem with multiple formulae? If it's a problem with a single, official formula (not cask) please file this issue at Homebrew/homebrew-core: https://github.com/Homebrew/homebrew-core/issues/new/choose. If it's a `brew cask` problem please file this issue at https://github.com/Homebrew/homebrew-cask/issues/new/choose. If it's a tap (e.g. Homebrew/homebrew-php) problem please file this issue at the tap.
+- [ ] ran a `brew` command and reproduced the problem with multiple formulae? If it's a problem with a single, official formula (not cask) please file this issue at Homebrew/homebrew-core: https://github.com/Homebrew/homebrew-core/issues/new/choose. If it's a `brew cask` problem please file this issue at https://github.com/caskroom/homebrew-cask/issues/new/choose. If it's a tap (e.g. Homebrew/homebrew-php) problem please file this issue at the tap.
 - [ ] ran `brew update` and can still reproduce the problem?
 - [ ] ran `brew doctor`, fixed all issues and can still reproduce the problem?
 - [ ] ran `brew config` and `brew doctor` and included their output with your issue?
diff --git a/Library/Homebrew/cask/lib/hbc/audit.rb b/Library/Homebrew/cask/lib/hbc/audit.rb
index 45c6f3ec3a..fb60951c01 100644
--- a/Library/Homebrew/cask/lib/hbc/audit.rb
+++ b/Library/Homebrew/cask/lib/hbc/audit.rb
@@ -61,7 +61,7 @@ module Hbc
 
       tap = @cask.tap
       return if tap.nil?
-      return if tap.user != "Homebrew"
+      return unless ["Homebrew", "caskroom"].include?(tap.user)
 
       return unless cask.artifacts.any? { |k| k.is_a?(Hbc::Artifact::Pkg) && k.stanza_options.key?(:allow_untrusted) }
       add_warning "allow_untrusted is not permitted in official Homebrew-Cask taps"
@@ -133,7 +133,7 @@ module Hbc
         return unless previous_cask.version == cask.version
         return if previous_cask.sha256 == cask.sha256
 
-        add_error "only sha256 changed (see: https://github.com/Homebrew/homebrew-cask/blob/master/doc/cask_language_reference/stanzas/sha256.md)"
+        add_error "only sha256 changed (see: https://github.com/caskroom/homebrew-cask/blob/master/doc/cask_language_reference/stanzas/sha256.md)"
       rescue CaskError => e
         add_warning "Skipped version and checksum comparison. Reading previous version failed: #{e}"
       end
@@ -250,7 +250,7 @@ module Hbc
       return if cask.appcast
       return unless cask.url.to_s =~ %r{github.com/([^/]+)/([^/]+)/releases/download/(\S+)}
 
-      add_warning "Cask uses GitHub releases, please add an appcast. See https://github.com/Homebrew/homebrew-cask/blob/master/doc/cask_language_reference/stanzas/appcast.md"
+      add_warning "Cask uses GitHub releases, please add an appcast. See https://github.com/caskroom/homebrew-cask/blob/master/doc/cask_language_reference/stanzas/appcast.md"
     end
 
     def check_url
@@ -261,9 +261,9 @@ module Hbc
     def check_download_url_format
       odebug "Auditing URL format"
       if bad_sourceforge_url?
-        add_warning "SourceForge URL format incorrect. See https://github.com/Homebrew/homebrew-cask/blob/master/doc/cask_language_reference/stanzas/url.md#sourceforgeosdn-urls"
+        add_warning "SourceForge URL format incorrect. See https://github.com/caskroom/homebrew-cask/blob/master/doc/cask_language_reference/stanzas/url.md#sourceforgeosdn-urls"
       elsif bad_osdn_url?
-        add_warning "OSDN URL format incorrect. See https://github.com/Homebrew/homebrew-cask/blob/master/doc/cask_language_reference/stanzas/url.md#sourceforgeosdn-urls"
+        add_warning "OSDN URL format incorrect. See https://github.com/caskroom/homebrew-cask/blob/master/doc/cask_language_reference/stanzas/url.md#sourceforgeosdn-urls"
       end
     end
 
diff --git a/Library/Homebrew/cask/lib/hbc/cli/search.rb b/Library/Homebrew/cask/lib/hbc/cli/search.rb
index 3decd6bd8d..429f9d5309 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/search.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/search.rb
@@ -21,7 +21,7 @@ module Hbc
       def self.search_remote(query)
         matches = begin
           GitHub.search_code(
-            user: "Homebrew",
+            user: ["Homebrew", "caskroom"],
             path: "Casks",
             filename: query,
             extension: "rb",
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/caveats.rb b/Library/Homebrew/cask/lib/hbc/dsl/caveats.rb
index 54a28495ab..761f85eb08 100644
--- a/Library/Homebrew/cask/lib/hbc/dsl/caveats.rb
+++ b/Library/Homebrew/cask/lib/hbc/dsl/caveats.rb
@@ -100,7 +100,7 @@ module Hbc
           <<~EOS
             #{@cask} requires Java #{java_version}. You can install it with
 
-              brew cask install homebrew/cask-versions/java#{java_version}
+              brew cask install caskroom/versions/java#{java_version}
           EOS
         end
       end
@@ -150,7 +150,7 @@ module Hbc
           If this report is accurate, please duplicate it at
             #{Formatter.url("https://bugreport.apple.com/")}
           If this report is a mistake, please let us know by opening an issue at
-            #{Formatter.url("https://github.com/Homebrew/homebrew-cask/issues/new")}
+            #{Formatter.url("https://github.com/caskroom/homebrew-cask/issues/new")}
         EOS
       end
     end
diff --git a/Library/Homebrew/cask/lib/hbc/locations.rb b/Library/Homebrew/cask/lib/hbc/locations.rb
index 4e1bafc94f..fea696e5b0 100644
--- a/Library/Homebrew/cask/lib/hbc/locations.rb
+++ b/Library/Homebrew/cask/lib/hbc/locations.rb
@@ -17,7 +17,7 @@ module Hbc
       attr_writer :default_tap
 
       def default_tap
-        @default_tap ||= Tap.fetch("homebrew", "homebrew-cask")
+        @default_tap ||= Tap.fetch("caskroom", "homebrew-cask")
       end
 
       def tcc_db
diff --git a/Library/Homebrew/cask/lib/hbc/utils.rb b/Library/Homebrew/cask/lib/hbc/utils.rb
index 00bc2a4b11..01ab4dad7f 100644
--- a/Library/Homebrew/cask/lib/hbc/utils.rb
+++ b/Library/Homebrew/cask/lib/hbc/utils.rb
@@ -2,7 +2,7 @@ require "yaml"
 require "open3"
 require "stringio"
 
-BUG_REPORTS_URL = "https://github.com/Homebrew/homebrew-cask#reporting-bugs".freeze
+BUG_REPORTS_URL = "https://github.com/caskroom/homebrew-cask#reporting-bugs".freeze
 
 # global methods
 
diff --git a/Library/Homebrew/cmd/search.rb b/Library/Homebrew/cmd/search.rb
index faf9557e76..0f01afa46f 100644
--- a/Library/Homebrew/cmd/search.rb
+++ b/Library/Homebrew/cmd/search.rb
@@ -110,7 +110,7 @@ module Homebrew
 
     matches = begin
       GitHub.search_code(
-        user: "Homebrew",
+        user: ["Homebrew", "caskroom"],
         path: ["Formula", "HomebrewFormula", "Casks", "."],
         filename: query,
         extension: "rb",
@@ -122,7 +122,7 @@ module Homebrew
     matches.map do |match|
       filename = File.basename(match["path"], ".rb")
       tap = Tap.fetch(match["repository"]["full_name"])
-      next if tap.installed? && !(tap.user == "Homebrew" && tap.repo.start_with?("cask"))
+      next if tap.installed? && match["repository"]["owner"]["login"] != "caskroom"
       "#{tap.name}/#{filename}"
     end.compact
   end
diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb
index 97ba6e9279..013cab3a91 100644
--- a/Library/Homebrew/cmd/update-report.rb
+++ b/Library/Homebrew/cmd/update-report.rb
@@ -470,7 +470,7 @@ class Reporter
       next unless tabs.first.tap == tap # skip if installed formula is not from this tap.
       new_tap = Tap.fetch(new_tap_name)
       # For formulae migrated to cask: Auto-install cask or provide install instructions.
-      if new_tap_name.start_with?("homebrew/cask")
+      if ["homebrew/cask", "caskroom/cask"].include?(new_tap_name)
         if new_tap.installed? && (HOMEBREW_PREFIX/"Caskroom").directory?
           ohai "#{name} has been moved to Homebrew-Cask."
           ohai "brew unlink #{name}"
@@ -489,7 +489,6 @@ class Reporter
           ohai "#{name} has been moved to Homebrew-Cask.", <<~EOS
             To uninstall the formula and install the cask run:
               brew uninstall --force #{name}
-              brew tap #{new_tap_name}
               brew cask install #{new_name}
           EOS
         end
diff --git a/Library/Homebrew/manpages/brew-cask.1.md b/Library/Homebrew/manpages/brew-cask.1.md
index 5468f2bd3a..202aedb033 100644
--- a/Library/Homebrew/manpages/brew-cask.1.md
+++ b/Library/Homebrew/manpages/brew-cask.1.md
@@ -242,13 +242,13 @@ described above, the argument can take the form of:
 Homebrew-Cask also accepts three other forms in place of plain tokens:
 
   * A fully-qualified token which includes the Tap name, e.g.
-    `homebrew/cask-fonts/font-symbola`
+    `caskroom/fonts/font-symbola`
 
   * A fully-qualified pathname to a Cask file, e.g.
-    `/usr/local/Library/Taps/homebrew/homebrew-cask/Casks/google-chrome.rb`
+    `/usr/local/Library/Taps/caskroom/homebrew-cask/Casks/google-chrome.rb`
 
   * A `curl`-retrievable URI to a Cask file, e.g.
-    `https://raw.githubusercontent.com/Homebrew/homebrew-cask/f25b6babcd398abf48e33af3d887b2d00de1d661/Casks/google-chrome.rb`
+    `https://raw.githubusercontent.com/caskroom/homebrew-cask/f25b6babcd398abf48e33af3d887b2d00de1d661/Casks/google-chrome.rb`
 
 ## ENVIRONMENT
 
@@ -275,7 +275,7 @@ Other environment variables:
 
 The Homebrew-Cask home page: <https://caskroom.github.io/>
 
-The Homebrew-Cask GitHub page: <https://github.com/Homebrew/homebrew-cask>
+The Homebrew-Cask GitHub page: <https://github.com/caskroom/homebrew-cask>
 
 `brew`(1), `curl`(1)
 
@@ -288,7 +288,7 @@ Man page format based on `brew.1.md` from Homebrew.
 ## BUGS
 
 We still have bugs - and we are busy fixing them!  If you have a problem, don't
-be shy about reporting it on our [GitHub issues page](https://github.com/Homebrew/homebrew-cask/issues?state=open).
+be shy about reporting it on our [GitHub issues page](https://github.com/caskroom/homebrew-cask/issues?state=open).
 
 When reporting bugs, remember that Homebrew-Cask is an independent project from
 Homebrew. Do your best to direct bug reports to the appropriate project. If
diff --git a/Library/Homebrew/manpages/brew.1.md.erb b/Library/Homebrew/manpages/brew.1.md.erb
index 100a69d297..3d54243a3d 100644
--- a/Library/Homebrew/manpages/brew.1.md.erb
+++ b/Library/Homebrew/manpages/brew.1.md.erb
@@ -65,7 +65,7 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
     Install macOS applications distributed as binaries.
 
 
-  Homebrew/homebrew-cask <https://github.com/Homebrew/homebrew-cask>
+  Caskroom/homebrew-cask <https://github.com/caskroom/homebrew-cask>
 
   <%= homebrew_services.join("\n  ").strip %>
 
diff --git a/Library/Homebrew/missing_formula.rb b/Library/Homebrew/missing_formula.rb
index d4c209ba92..9648f49600 100644
--- a/Library/Homebrew/missing_formula.rb
+++ b/Library/Homebrew/missing_formula.rb
@@ -101,7 +101,7 @@ module Homebrew
           EOS
           break if new_tap_name == CoreTap.instance.name
 
-          install_cmd = if new_tap_name.start_with?("homebrew/cask")
+          install_cmd = if new_tap_user == "caskroom" || (new_tap_user == "homebrew" && new_tap_repo.start_with?("cask"))
             "cask install"
           else
             "install"
diff --git a/Library/Homebrew/requirements/java_requirement.rb b/Library/Homebrew/requirements/java_requirement.rb
index c9f5b8e182..27348fa8cc 100644
--- a/Library/Homebrew/requirements/java_requirement.rb
+++ b/Library/Homebrew/requirements/java_requirement.rb
@@ -57,7 +57,7 @@ class JavaRequirement < Requirement
   private
 
   JAVA_CASK_MAP = {
-    "1.8" => "homebrew/cask-versions/java8",
+    "1.8" => "caskroom/versions/java8",
     "10.0" => "java",
   }.freeze
 
diff --git a/Library/Homebrew/test/cask/cli_spec.rb b/Library/Homebrew/test/cask/cli_spec.rb
index 72ee2c7796..495aedb088 100644
--- a/Library/Homebrew/test/cask/cli_spec.rb
+++ b/Library/Homebrew/test/cask/cli_spec.rb
@@ -1,14 +1,14 @@
 describe Hbc::CLI, :cask do
   it "lists the taps for Casks that show up in two taps" do
     listing = described_class.nice_listing(%w[
-                                             homebrew/cask/adium
-                                             homebrew/cask/google-chrome
+                                             caskroom/cask/adium
+                                             caskroom/cask/google-chrome
                                              passcod/homebrew-cask/adium
                                            ])
 
     expect(listing).to eq(%w[
+                            caskroom/cask/adium
                             google-chrome
-                            homebrew/cask/adium
                             passcod/cask/adium
                           ])
   end
diff --git a/Library/Homebrew/test/cask/dsl_spec.rb b/Library/Homebrew/test/cask/dsl_spec.rb
index 67fcb027a8..0348daab13 100644
--- a/Library/Homebrew/test/cask/dsl_spec.rb
+++ b/Library/Homebrew/test/cask/dsl_spec.rb
@@ -26,7 +26,7 @@ describe Hbc::DSL, :cask do
         .*
         Unexpected method 'future_feature' called on Cask unexpected-method-cask\\.
         .*
-        https://github.com/Homebrew/homebrew-cask#reporting-bugs
+        https://github.com/caskroom/homebrew-cask#reporting-bugs
       EOS
 
       expect {
diff --git a/Library/Homebrew/test/cmd/cask_spec.rb b/Library/Homebrew/test/cmd/cask_spec.rb
index 0692e815a3..aa34f50e8b 100644
--- a/Library/Homebrew/test/cmd/cask_spec.rb
+++ b/Library/Homebrew/test/cmd/cask_spec.rb
@@ -1,7 +1,7 @@
 describe "brew cask", :integration_test, :needs_macos, :needs_network do
   describe "list" do
     it "returns a list of installed Casks" do
-      setup_remote_tap("homebrew/cask")
+      setup_remote_tap("caskroom/cask")
 
       expect { brew "cask", "list" }.to be_a_success
     end
diff --git a/Library/Homebrew/test/cmd/search_spec.rb b/Library/Homebrew/test/cmd/search_spec.rb
index 1e1ef8e180..15c66cba31 100644
--- a/Library/Homebrew/test/cmd/search_spec.rb
+++ b/Library/Homebrew/test/cmd/search_spec.rb
@@ -25,9 +25,9 @@ describe "brew search", :integration_test do
   end
 
   it "falls back to a GitHub tap search when no formula is found", :needs_network, retry: 3 do
-    setup_remote_tap "homebrew/cask"
+    setup_remote_tap "caskroom/cask"
 
-    expect { brew "search", "homebrew/cask/firefox" }
+    expect { brew "search", "caskroom/cask/firefox" }
       .to output(/firefox/).to_stdout
       .and output(/Searching/).to_stderr
       .and be_a_success
diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb
index 2f670bc0e7..30c406a8c7 100644
--- a/Library/Homebrew/test/spec_helper.rb
+++ b/Library/Homebrew/test/spec_helper.rb
@@ -133,6 +133,7 @@ RSpec.configure do |config|
         HOMEBREW_PREFIX/"share",
         HOMEBREW_PREFIX/"opt",
         HOMEBREW_PREFIX/"Caskroom",
+        HOMEBREW_LIBRARY/"Taps/caskroom",
         HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-cask",
         HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-bar",
         HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-bundle",
diff --git a/completions/bash/brew b/completions/bash/brew
index 24046fbba4..6df866577d 100644
--- a/completions/bash/brew
+++ b/completions/bash/brew
@@ -569,7 +569,7 @@ __brew_cask_complete_formulae ()
     local cur="${COMP_WORDS[COMP_CWORD]}"
     local lib=$(brew --repository)/Library
     local taps=${lib}/Taps
-    local casks=${lib}/Taps/homebrew/homebrew-cask/Casks
+    local casks=${lib}/Taps/caskroom/homebrew-cask/Casks
     local ff=$(\ls ${casks} 2>/dev/null | \sed 's/\.rb//g')
 
     COMPREPLY=($(compgen -W "$ff" -- "$cur"))
@@ -585,7 +585,7 @@ __brew_cask_complete_installed ()
 __brew_cask_complete_caskroom ()
 {
     local cur="${COMP_WORDS[COMP_CWORD]}"
-    local caskroom_dir="$(brew --prefix)/Caskroom/"
+    local caskroom_dir=/opt/homebrew-cask/Caskroom/
     local files=$(\ls ${caskroom_dir} 2>/dev/null)
     COMPREPLY=($(compgen -W "$files" -- "$cur"))
 }
@@ -721,7 +721,7 @@ _brew_cask ()
     done
 
     if [[ $i -eq $COMP_CWORD ]]; then
-        __brew_caskcomp "abv audit cat cleanup create doctor edit fetch home info install list ls outdated reinstall remove rm search style uninstall upgrade zap -S --force --verbose --appdir --colorpickerdir --prefpanedir --qlplugindir --fontdir --servicedir --input_methoddir --internet_plugindir --screen_saverdir --no-binaries --debug --version"
+        __brew_caskcomp "abv audit cat cleanup create doctor edit fetch home info install list ls outdated reinstall remove rm search style uninstall upgrade zap -S --force --caskroom --verbose --appdir --colorpickerdir --prefpanedir --qlplugindir --fontdir --servicedir --input_methoddir --internet_plugindir --screen_saverdir --no-binaries --debug --version"
         return
     fi
 
diff --git a/completions/zsh/_brew_cask b/completions/zsh/_brew_cask
index 3293319c80..d702ea0933 100644
--- a/completions/zsh/_brew_cask
+++ b/completions/zsh/_brew_cask
@@ -13,7 +13,7 @@ zstyle -T ':completion:*:*:*:brew-cask:*' tag-order && \
 	zstyle ':completion:*:*:*:brew-cask:*' tag-order 'commands'
 
 __brew_cask() {
-  [ -d "$(brew --repo homebrew/cask)" ] && brew cask $@
+  [ -d "$(brew --repo caskroom/cask)" ] && brew cask $@
 }
 
 __brew_all_casks() {
diff --git a/docs/Acceptable-Formulae.md b/docs/Acceptable-Formulae.md
index 5a9ed7a724..914e8a94e9 100644
--- a/docs/Acceptable-Formulae.md
+++ b/docs/Acceptable-Formulae.md
@@ -23,7 +23,7 @@ Our policy is that formulae in the core tap
 ([homebrew/core](https://github.com/Homebrew/homebrew-core)) must be open-source
 and either built from source or produce cross-platform binaries (e.g. Java, Mono).
 Binary-only formulae should go to
-[Homebrew Cask](https://github.com/Homebrew/homebrew-cask).
+[Homebrew Cask](https://github.com/caskroom/homebrew-cask).
 
 ### Stable versions
 Formulae in the core repository must have a stable version tagged by
@@ -57,7 +57,7 @@ running a package manager.
 
 ### Stuff that builds an `.app`
 Don’t make your formula build an `.app` (native macOS Application); we
-don’t want those things in Homebrew. Encourage upstream projects to build and support a `.app` that can be distributed by [Homebrew Cask](https://github.com/Homebrew/homebrew-cask) (and used without it, too).
+don’t want those things in Homebrew. Encourage upstream projects to build and support a `.app` that can be distributed by [Homebrew Cask](https://github.com/caskroom/homebrew-cask) (and used without it, too).
 
 ### Stuff that builds a GUI by default (but doesn't have to)
 Make it build a command-line tool or a library by default and, if the GUI is useful and would be widely used, add an option to build the GUI. Don't offer an option for multiple GUI backends e.g. X11 is a bad user experience for GUIs on macOS.
diff --git a/docs/Formula-Cookbook.md b/docs/Formula-Cookbook.md
index c405c8f71f..37237265d7 100644
--- a/docs/Formula-Cookbook.md
+++ b/docs/Formula-Cookbook.md
@@ -12,7 +12,7 @@ A formula is a package definition written in Ruby. It can be created with `brew
 | **Cellar**     | All **Kegs** are installed here                            | `/usr/local/Cellar`                                             |
 | **Tap**        | A Git repository of **Formulae** and/or commands | `/usr/local/Homebrew/Library/Taps/homebrew/homebrew-core`   |
 | **Bottle**     | Pre-built **Keg** used instead of building from source     | `qt-4.8.4.mavericks.bottle.tar.gz`                              |
-| **Cask**       | An [extension of homebrew](https://github.com/Homebrew/homebrew-cask) to install macOS native apps  | `/Applications/MacDown.app/Contents/SharedSupport/bin/macdown` |
+| **Cask**       | An [extension of homebrew](https://github.com/caskroom/homebrew-cask) to install macOS native apps  | `/Applications/MacDown.app/Contents/SharedSupport/bin/macdown` |
 | **Brew Bundle**| An [extension of homebrew](https://github.com/Homebrew/homebrew-bundle) to describe dependencies    | `brew 'myservice', restart_service: true` |
 
 ## An introduction
diff --git a/docs/Manpage.md b/docs/Manpage.md
index b4dc5f835f..d68d9784c0 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -1005,7 +1005,7 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
     Install macOS applications distributed as binaries.
 
 
-  Homebrew/homebrew-cask <https://github.com/Homebrew/homebrew-cask>
+  Caskroom/homebrew-cask <https://github.com/caskroom/homebrew-cask>
 
   * `services` `command`:
 
diff --git a/docs/Troubleshooting.md b/docs/Troubleshooting.md
index cbbf557152..ca8f899ad3 100644
--- a/docs/Troubleshooting.md
+++ b/docs/Troubleshooting.md
@@ -17,7 +17,7 @@ Follow these steps to fix common problems:
 ## Check to see if the issue has been reported
 
 * Search the [issue tracker](https://github.com/Homebrew/homebrew-core/issues) to see if someone else has already reported the same issue.
-* Make sure you search issues on the correct repository. If a formula that has failed to build is part of a non-homebrew-core tap or a cask is part of [Homebrew/cask](https://github.com/Homebrew/homebrew-cask/issues) check those issue trackers instead.
+* Make sure you search issues on the correct repository. If a formula that has failed to build is part of a non-homebrew-core tap or a cask is part of [caskroom/cask](https://github.com/caskroom/homebrew-cask/issues) check those issue trackers instead.
 
 ## Create an issue
 
diff --git a/manpages/brew-cask.1 b/manpages/brew-cask.1
index 1b2c9fae75..e31dfd107f 100644
--- a/manpages/brew-cask.1
+++ b/manpages/brew-cask.1
@@ -270,13 +270,13 @@ A token as returned by \fBbrew cask search\fR, e\.g\. \fBgoogle\-chrome\fR
 Homebrew\-Cask also accepts three other forms in place of plain tokens:
 .
 .IP "\(bu" 4
-A fully\-qualified token which includes the Tap name, e\.g\. \fBhomebrew/cask\-fonts/font\-symbola\fR
+A fully\-qualified token which includes the Tap name, e\.g\. \fBcaskroom/fonts/font\-symbola\fR
 .
 .IP "\(bu" 4
-A fully\-qualified pathname to a Cask file, e\.g\. \fB/usr/local/Library/Taps/homebrew/homebrew\-cask/Casks/google\-chrome\.rb\fR
+A fully\-qualified pathname to a Cask file, e\.g\. \fB/usr/local/Library/Taps/caskroom/homebrew\-cask/Casks/google\-chrome\.rb\fR
 .
 .IP "\(bu" 4
-A \fBcurl\fR\-retrievable URI to a Cask file, e\.g\. \fBhttps://raw\.githubusercontent\.com/Homebrew/homebrew\-cask/f25b6babcd398abf48e33af3d887b2d00de1d661/Casks/google\-chrome\.rb\fR
+A \fBcurl\fR\-retrievable URI to a Cask file, e\.g\. \fBhttps://raw\.githubusercontent\.com/caskroom/homebrew\-cask/f25b6babcd398abf48e33af3d887b2d00de1d661/Casks/google\-chrome\.rb\fR
 .
 .IP "" 0
 .
@@ -312,7 +312,7 @@ When this variable is set, Homebrew\-Cask will call \fBsudo\fR(8) with the \fB\-
 The Homebrew\-Cask home page: \fIhttps://caskroom\.github\.io/\fR
 .
 .P
-The Homebrew\-Cask GitHub page: \fIhttps://github\.com/Homebrew/homebrew\-cask\fR
+The Homebrew\-Cask GitHub page: \fIhttps://github\.com/caskroom/homebrew\-cask\fR
 .
 .P
 \fBbrew\fR(1), \fBcurl\fR(1)
@@ -324,7 +324,7 @@ Paul Hinze and Contributors\.
 Man page format based on \fBbrew\.1\.md\fR from Homebrew\.
 .
 .SH "BUGS"
-We still have bugs \- and we are busy fixing them! If you have a problem, don\'t be shy about reporting it on our GitHub issues page \fIhttps://github\.com/Homebrew/homebrew\-cask/issues?state=open\fR\.
+We still have bugs \- and we are busy fixing them! If you have a problem, don\'t be shy about reporting it on our GitHub issues page \fIhttps://github\.com/caskroom/homebrew\-cask/issues?state=open\fR\.
 .
 .P
 When reporting bugs, remember that Homebrew\-Cask is an independent project from Homebrew\. Do your best to direct bug reports to the appropriate project\. If your command\-line started with \fBbrew cask\fR, bring the bug to us first!
diff --git a/manpages/brew.1 b/manpages/brew.1
index 66924dda02..a083aa134f 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -1029,7 +1029,7 @@ Homebrew/homebrew\-bundle \fIhttps://github\.com/Homebrew/homebrew\-bundle\fR
 Install macOS applications distributed as binaries\.
 .
 .P
-Homebrew/homebrew\-cask \fIhttps://github\.com/Homebrew/homebrew\-cask\fR
+Caskroom/homebrew\-cask \fIhttps://github\.com/caskroom/homebrew\-cask\fR
 .
 .TP
 \fBservices\fR \fIcommand\fR: