diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb
index 29d57bd65d..b97e5610ee 100644
--- a/Library/Homebrew/cmd/audit.rb
+++ b/Library/Homebrew/cmd/audit.rb
@@ -920,9 +920,9 @@ class FormulaAuditor
 
     if formula.tap.tap_migrations.key?(formula.name)
       problem <<-EOS.undent
-       #{formula.name} seems to be listed in tap_migrations.json!
-       Please remove #{formula.name} from present tap & tap_migrations.json
-       before submitting it to Homebrew/homebrew.
+        #{formula.name} seems to be listed in tap_migrations.json!
+        Please remove #{formula.name} from present tap & tap_migrations.json
+        before submitting it to Homebrew/homebrew-#{formula.tap.repo}.
       EOS
     end
   end
diff --git a/Library/Homebrew/cmd/pull.rb b/Library/Homebrew/cmd/pull.rb
index 93470dc481..7347be5610 100644
--- a/Library/Homebrew/cmd/pull.rb
+++ b/Library/Homebrew/cmd/pull.rb
@@ -43,7 +43,7 @@ module Homebrew
       if arg.to_i > 0
         issue = arg
         if ARGV.include? "--legacy"
-          url = "https://github.com/Homebrew/homebrew/pull/#{arg}"
+          url = "https://github.com/Homebrew/legacy-homebrew/pull/#{arg}"
         else
           url = "https://github.com/Homebrew/homebrew-core/pull/#{arg}"
         end
@@ -146,7 +146,7 @@ module Homebrew
       if issue && !ARGV.include?("--clean")
         ohai "Patch closes issue ##{issue}"
         if ARGV.include?("--legacy")
-          close_message = "Closes Homebrew/homebrew##{issue}."
+          close_message = "Closes Homebrew/legacy-homebrew##{issue}."
         else
           close_message = "Closes ##{issue}."
         end
diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb
index 6ffba45c23..887012c40d 100644
--- a/Library/Homebrew/cmd/test-bot.rb
+++ b/Library/Homebrew/cmd/test-bot.rb
@@ -809,7 +809,7 @@ module Homebrew
 
     if pr
       if ARGV.include?("--legacy")
-        pull_pr = "https://github.com/Homebrew/homebrew/pull/#{pr}"
+        pull_pr = "https://github.com/Homebrew/legacy-homebrew/pull/#{pr}"
         safe_system "brew", "pull", "--clean", "--legacy", pull_pr
       else
         pull_pr = "https://github.com/#{tap.user}/homebrew-#{tap.repo}/pull/#{pr}"
diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb
index 54568befd8..5f8637f688 100644
--- a/Library/Homebrew/os/mac.rb
+++ b/Library/Homebrew/os/mac.rb
@@ -305,9 +305,9 @@ module OS
     rescue IndexError
       onoe <<-EOS.undent
         Homebrew doesn't know what compiler versions ship with your version
-        of Xcode (#{Xcode.version}). Please `brew update` and if that doesn't help, file
-        an issue with the output of `brew --config`:
-          https://github.com/Homebrew/homebrew/issues
+        of Xcode (#{Xcode.version}). Please `brew update` and if that doesn't
+        help, file an issue with the output of `brew --config`:
+          https://github.com/Homebrew/brew/issues
 
         Note that we only track stable, released versions of Xcode.
 
diff --git a/Library/Homebrew/test/test_formulary.rb b/Library/Homebrew/test/test_formulary.rb
index d8f57a90b4..ec18ee0532 100644
--- a/Library/Homebrew/test/test_formulary.rb
+++ b/Library/Homebrew/test/test_formulary.rb
@@ -47,7 +47,7 @@ class FormularyFactoryTest < Homebrew::TestCase
   end
 
   def test_factory_with_fully_qualified_name
-    assert_kind_of Formula, Formulary.factory("homebrew/homebrew/#{@name}")
+    assert_kind_of Formula, Formulary.factory("homebrew/core/#{@name}")
   end
 
   def test_formula_unavailable_error
diff --git a/Library/Homebrew/test/test_integration_cmds.rb b/Library/Homebrew/test/test_integration_cmds.rb
index 865daa5203..ed6f2e6020 100644
--- a/Library/Homebrew/test/test_integration_cmds.rb
+++ b/Library/Homebrew/test/test_integration_cmds.rb
@@ -209,7 +209,7 @@ class IntegrationCommandTests < Homebrew::TestCase
     alias_file.parent.mkpath
     FileUtils.ln_s formula_file, alias_file
     cmd("readall", "--aliases", "--syntax")
-    cmd("readall", "Homebrew/homebrew")
+    cmd("readall", "homebrew/core")
   ensure
     formula_file.unlink unless formula_file.nil?
     repo.alias_dir.rmtree
diff --git a/Library/Homebrew/test/test_migrator.rb b/Library/Homebrew/test/test_migrator.rb
index 7816350934..f11c5a032f 100644
--- a/Library/Homebrew/test/test_migrator.rb
+++ b/Library/Homebrew/test/test_migrator.rb
@@ -30,7 +30,7 @@ class MigratorErrorsTests < Homebrew::TestCase
     keg.mkpath
     tab = Tab.empty
     tab.tabfile = HOMEBREW_CELLAR/"oldname/0.1/INSTALL_RECEIPT.json"
-    tab.source["tap"] = "Homebrew/homebrew"
+    tab.source["tap"] = "homebrew/core"
     tab.write
     assert_raises(Migrator::MigratorDifferentTapsError) { Migrator.new(@new_f) }
   ensure
diff --git a/Library/Homebrew/test/test_software_spec.rb b/Library/Homebrew/test/test_software_spec.rb
index e7533aa0fd..8019e31619 100644
--- a/Library/Homebrew/test/test_software_spec.rb
+++ b/Library/Homebrew/test/test_software_spec.rb
@@ -29,7 +29,7 @@ class SoftwareSpecTests < Homebrew::TestCase
       end
 
       def tap
-        "Homebrew/homebrew"
+        "homebrew/core"
       end
     end.new
     assert_raises(ResourceMissingError) { @spec.resource("foo") }
@@ -38,7 +38,7 @@ class SoftwareSpecTests < Homebrew::TestCase
   def test_set_owner
     owner = stub :name => "some_name",
                  :full_name => "some_name",
-                 :tap => "Homebrew/homebrew"
+                 :tap => "homebrew/core"
     @spec.owner = owner
     assert_equal owner, @spec.owner
   end
@@ -47,7 +47,7 @@ class SoftwareSpecTests < Homebrew::TestCase
     @spec.resource("foo") { url "foo-1.0" }
     @spec.owner = stub :name => "some_name",
                        :full_name => "some_name",
-                       :tap => "Homebrew/homebrew"
+                       :tap => "homebrew/core"
     assert_equal "some_name", @spec.name
     @spec.resources.each_value { |r| assert_equal @spec, r.owner }
   end
@@ -57,7 +57,7 @@ class SoftwareSpecTests < Homebrew::TestCase
     @spec.resource("bar") { url "bar" }
     @spec.owner = stub :name => "some_name",
                        :full_name => "some_name",
-                       :tap => "Homebrew/homebrew"
+                       :tap => "homebrew/core"
     assert_version_equal "42", @spec.resource("bar").version
   end