From 90b3a139092b5a24bf54715c09c46d7c838ddedf Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 3 Sep 2018 19:39:07 +0100
Subject: [PATCH] cask: move cask/lib/hbc/* to cask/*.

Fix the load path, requires and some filenames accordingly.
---
 Library/Homebrew/cask/all.rb                  | 21 +++++++++
 Library/Homebrew/cask/artifact.rb             | 28 +++++++++++
 .../hbc => }/artifact/abstract_artifact.rb    |  0
 .../artifact/abstract_flight_block.rb         |  2 +-
 .../hbc => }/artifact/abstract_uninstall.rb   |  2 +-
 .../cask/{lib/hbc => }/artifact/app.rb        |  2 +-
 .../cask/{lib/hbc => }/artifact/artifact.rb   |  2 +-
 .../hbc => }/artifact/audio_unit_plugin.rb    |  2 +-
 .../cask/{lib/hbc => }/artifact/binary.rb     |  2 +-
 .../{lib/hbc => }/artifact/colorpicker.rb     |  2 +-
 .../cask/{lib/hbc => }/artifact/dictionary.rb |  2 +-
 .../cask/{lib/hbc => }/artifact/font.rb       |  2 +-
 .../{lib/hbc => }/artifact/input_method.rb    |  2 +-
 .../cask/{lib/hbc => }/artifact/installer.rb  |  2 +-
 .../{lib/hbc => }/artifact/internet_plugin.rb |  2 +-
 .../cask/{lib/hbc => }/artifact/moved.rb      |  2 +-
 .../cask/{lib/hbc => }/artifact/pkg.rb        |  2 +-
 .../hbc => }/artifact/postflight_block.rb     |  2 +-
 .../{lib/hbc => }/artifact/preflight_block.rb |  2 +-
 .../cask/{lib/hbc => }/artifact/prefpane.rb   |  2 +-
 .../cask/{lib/hbc => }/artifact/qlplugin.rb   |  2 +-
 .../cask/{lib/hbc => }/artifact/relocated.rb  |  2 +-
 .../{lib/hbc => }/artifact/screen_saver.rb    |  2 +-
 .../cask/{lib/hbc => }/artifact/service.rb    |  2 +-
 .../cask/{lib/hbc => }/artifact/stage_only.rb |  2 +-
 .../cask/{lib/hbc => }/artifact/suite.rb      |  2 +-
 .../cask/{lib/hbc => }/artifact/symlinked.rb  |  2 +-
 .../cask/{lib/hbc => }/artifact/uninstall.rb  |  2 +-
 .../{lib/hbc => }/artifact/vst3_plugin.rb     |  2 +-
 .../cask/{lib/hbc => }/artifact/vst_plugin.rb |  2 +-
 .../cask/{lib/hbc => }/artifact/zap.rb        |  2 +-
 Library/Homebrew/cask/{lib/hbc => }/audit.rb  |  4 +-
 .../Homebrew/cask/{lib/hbc => }/auditor.rb    |  2 +-
 Library/Homebrew/cask/{lib/hbc => }/cache.rb  |  0
 Library/Homebrew/cask/{lib/hbc => }/cask.rb   |  8 ++--
 .../cask/{lib/hbc => }/cask_dependencies.rb   |  2 +-
 .../cask/{lib/hbc => }/cask_loader.rb         |  2 +-
 .../Homebrew/cask/{lib/hbc => }/caskroom.rb   |  0
 .../Homebrew/cask/{lib/hbc => }/checkable.rb  |  0
 Library/Homebrew/cask/{lib/hbc => }/cli.rb    | 46 +++++++++----------
 .../cask/{lib/hbc => }/cli/--version.rb       |  0
 .../{lib/hbc => }/cli/abstract_command.rb     |  0
 .../hbc => }/cli/abstract_internal_command.rb |  0
 .../Homebrew/cask/{lib/hbc => }/cli/audit.rb  |  0
 .../Homebrew/cask/{lib/hbc => }/cli/cat.rb    |  0
 .../Homebrew/cask/{lib/hbc => }/cli/create.rb |  0
 .../Homebrew/cask/{lib/hbc => }/cli/doctor.rb |  2 +-
 .../Homebrew/cask/{lib/hbc => }/cli/edit.rb   |  0
 .../Homebrew/cask/{lib/hbc => }/cli/fetch.rb  |  2 +-
 .../Homebrew/cask/{lib/hbc => }/cli/home.rb   |  0
 .../Homebrew/cask/{lib/hbc => }/cli/info.rb   |  0
 .../cask/{lib/hbc => }/cli/install.rb         |  0
 .../cask/{lib/hbc => }/cli/internal_help.rb   |  0
 .../cask/{lib/hbc => }/cli/internal_stanza.rb |  0
 .../Homebrew/cask/{lib/hbc => }/cli/list.rb   |  0
 .../cask/{lib/hbc => }/cli/options.rb         |  0
 .../cask/{lib/hbc => }/cli/outdated.rb        |  0
 .../cask/{lib/hbc => }/cli/reinstall.rb       |  0
 .../Homebrew/cask/{lib/hbc => }/cli/style.rb  |  0
 .../cask/{lib/hbc => }/cli/uninstall.rb       |  0
 .../cask/{lib/hbc => }/cli/upgrade.rb         |  0
 .../Homebrew/cask/{lib/hbc => }/cli/zap.rb    |  0
 Library/Homebrew/cask/{lib/hbc => }/config.rb |  0
 .../Homebrew/cask/{lib/hbc => }/download.rb   |  6 +--
 Library/Homebrew/cask/{lib/hbc => }/dsl.rb    | 30 ++++++------
 .../cask/{lib/hbc => }/dsl/appcast.rb         |  0
 .../Homebrew/cask/{lib/hbc => }/dsl/base.rb   |  0
 .../cask/{lib/hbc => }/dsl/caveats.rb         |  0
 .../cask/{lib/hbc => }/dsl/conflicts_with.rb  |  0
 .../cask/{lib/hbc => }/dsl/container.rb       |  0
 .../cask/{lib/hbc => }/dsl/depends_on.rb      |  0
 .../cask/{lib/hbc => }/dsl/postflight.rb      |  2 +-
 .../cask/{lib/hbc => }/dsl/preflight.rb       |  0
 .../{lib/hbc => }/dsl/uninstall_postflight.rb |  0
 .../{lib/hbc => }/dsl/uninstall_preflight.rb  |  2 +-
 .../cask/{lib/hbc => }/dsl/version.rb         |  0
 .../Homebrew/cask/{lib/hbc => }/exceptions.rb |  0
 .../Homebrew/cask/{lib/hbc => }/installer.rb  | 10 ++--
 Library/Homebrew/cask/lib/hbc.rb              | 21 ---------
 Library/Homebrew/cask/lib/hbc/artifact.rb     | 28 -----------
 Library/Homebrew/cask/{lib/hbc => }/macos.rb  |  0
 .../Homebrew/cask/{lib/hbc => }/metadata.rb   |  0
 Library/Homebrew/cask/{lib/hbc => }/pkg.rb    |  0
 .../Homebrew/cask/{lib/hbc => }/quarantine.rb |  2 +-
 Library/Homebrew/cask/{lib/hbc => }/staged.rb |  0
 .../cask/{lib/hbc => }/topological_hash.rb    |  0
 Library/Homebrew/cask/{lib/hbc => }/url.rb    |  0
 Library/Homebrew/cask/{lib/hbc => }/utils.rb  |  0
 .../cask/{lib/hbc => }/utils/quarantine.swift |  0
 Library/Homebrew/cask/{lib/hbc => }/verify.rb |  2 +-
 .../cask/{lib/hbc => }/verify/checksum.rb     |  0
 .../Homebrew/cask/{lib/hbc => }/version.rb    |  0
 Library/Homebrew/cleanup.rb                   |  2 +-
 Library/Homebrew/cmd/cask.rb                  |  2 +-
 Library/Homebrew/compat.rb                    |  2 +-
 Library/Homebrew/compat/{hbc.rb => cask.rb}   | 12 ++---
 .../Homebrew/compat/{hbc => cask}/cache.rb    |  0
 .../compat/{hbc => cask}/cask_loader.rb       |  0
 .../Homebrew/compat/{hbc => cask}/caskroom.rb |  0
 .../compat/{hbc => cask}/cli/cleanup.rb       |  2 +-
 .../compat/{hbc => cask}/cli/search.rb        |  2 +-
 Library/Homebrew/compat/{hbc => cask}/dsl.rb  |  0
 Library/Homebrew/dev-cmd/irb.rb               |  3 +-
 Library/Homebrew/extend/os/mac/search.rb      |  4 +-
 Library/Homebrew/global.rb                    |  4 --
 .../Homebrew/test/cask/dsl/caveats_spec.rb    |  2 +-
 .../Homebrew/test/cask/dsl/postflight_spec.rb |  4 +-
 .../Homebrew/test/cask/dsl/preflight_spec.rb  |  4 +-
 .../cask/dsl/uninstall_postflight_spec.rb     |  2 +-
 .../test/cask/dsl/uninstall_preflight_spec.rb |  4 +-
 Library/Homebrew/test/cleanup_spec.rb         |  2 +-
 .../spec/shared_context/homebrew_cask.rb      |  2 +-
 .../{hbc_dsl_base.rb => cask_dsl_base.rb}     |  2 +-
 .../{hbc_staged.rb => cask_staged.rb}         |  2 +-
 Library/Homebrew/update_migrator.rb           |  4 +-
 115 files changed, 166 insertions(+), 171 deletions(-)
 create mode 100644 Library/Homebrew/cask/all.rb
 create mode 100644 Library/Homebrew/cask/artifact.rb
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/abstract_artifact.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/abstract_flight_block.rb (96%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/abstract_uninstall.rb (99%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/app.rb (70%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/artifact.rb (96%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/audio_unit_plugin.rb (73%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/binary.rb (91%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/colorpicker.rb (72%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/dictionary.rb (71%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/font.rb (70%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/input_method.rb (72%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/installer.rb (98%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/internet_plugin.rb (72%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/moved.rb (98%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/pkg.rb (98%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/postflight_block.rb (67%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/preflight_block.rb (67%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/prefpane.rb (82%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/qlplugin.rb (94%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/relocated.rb (98%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/screen_saver.rb (72%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/service.rb (71%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/stage_only.rb (90%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/suite.rb (85%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/symlinked.rb (98%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/uninstall.rb (81%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/vst3_plugin.rb (71%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/vst_plugin.rb (71%)
 rename Library/Homebrew/cask/{lib/hbc => }/artifact/zap.rb (80%)
 rename Library/Homebrew/cask/{lib/hbc => }/audit.rb (99%)
 rename Library/Homebrew/cask/{lib/hbc => }/auditor.rb (98%)
 rename Library/Homebrew/cask/{lib/hbc => }/cache.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cask.rb (97%)
 rename Library/Homebrew/cask/{lib/hbc => }/cask_dependencies.rb (96%)
 rename Library/Homebrew/cask/{lib/hbc => }/cask_loader.rb (99%)
 rename Library/Homebrew/cask/{lib/hbc => }/caskroom.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/checkable.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli.rb (91%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/--version.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/abstract_command.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/abstract_internal_command.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/audit.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/cat.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/create.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/doctor.rb (99%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/edit.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/fetch.rb (96%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/home.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/info.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/install.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/internal_help.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/internal_stanza.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/list.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/options.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/outdated.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/reinstall.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/style.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/uninstall.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/upgrade.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/cli/zap.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/config.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/download.rb (94%)
 rename Library/Homebrew/cask/{lib/hbc => }/dsl.rb (94%)
 rename Library/Homebrew/cask/{lib/hbc => }/dsl/appcast.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/dsl/base.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/dsl/caveats.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/dsl/conflicts_with.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/dsl/container.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/dsl/depends_on.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/dsl/postflight.rb (91%)
 rename Library/Homebrew/cask/{lib/hbc => }/dsl/preflight.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/dsl/uninstall_postflight.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/dsl/uninstall_preflight.rb (81%)
 rename Library/Homebrew/cask/{lib/hbc => }/dsl/version.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/exceptions.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/installer.rb (99%)
 delete mode 100644 Library/Homebrew/cask/lib/hbc.rb
 delete mode 100644 Library/Homebrew/cask/lib/hbc/artifact.rb
 rename Library/Homebrew/cask/{lib/hbc => }/macos.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/metadata.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/pkg.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/quarantine.rb (95%)
 rename Library/Homebrew/cask/{lib/hbc => }/staged.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/topological_hash.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/url.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/utils.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/utils/quarantine.swift (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/verify.rb (96%)
 rename Library/Homebrew/cask/{lib/hbc => }/verify/checksum.rb (100%)
 rename Library/Homebrew/cask/{lib/hbc => }/version.rb (100%)
 rename Library/Homebrew/compat/{hbc.rb => cask.rb} (57%)
 rename Library/Homebrew/compat/{hbc => cask}/cache.rb (100%)
 rename Library/Homebrew/compat/{hbc => cask}/cask_loader.rb (100%)
 rename Library/Homebrew/compat/{hbc => cask}/caskroom.rb (100%)
 rename Library/Homebrew/compat/{hbc => cask}/cli/cleanup.rb (96%)
 rename Library/Homebrew/compat/{hbc => cask}/cli/search.rb (91%)
 rename Library/Homebrew/compat/{hbc => cask}/dsl.rb (100%)
 rename Library/Homebrew/test/support/helper/spec/shared_examples/{hbc_dsl_base.rb => cask_dsl_base.rb} (95%)
 rename Library/Homebrew/test/support/helper/spec/shared_examples/{hbc_staged.rb => cask_staged.rb} (99%)

diff --git a/Library/Homebrew/cask/all.rb b/Library/Homebrew/cask/all.rb
new file mode 100644
index 0000000000..1fe92d5ab2
--- /dev/null
+++ b/Library/Homebrew/cask/all.rb
@@ -0,0 +1,21 @@
+require "hardware"
+
+require "cask/artifact"
+require "cask/audit"
+require "cask/auditor"
+require "cask/cache"
+require "cask/cask"
+require "cask/cask_loader"
+require "cask/caskroom"
+require "cask/checkable"
+require "cask/cli"
+require "cask/cask_dependencies"
+require "cask/exceptions"
+require "cask/installer"
+require "cask/macos"
+require "cask/pkg"
+require "cask/staged"
+require "cask/topological_hash"
+require "cask/utils"
+require "cask/verify"
+require "cask/version"
diff --git a/Library/Homebrew/cask/artifact.rb b/Library/Homebrew/cask/artifact.rb
new file mode 100644
index 0000000000..f50249116a
--- /dev/null
+++ b/Library/Homebrew/cask/artifact.rb
@@ -0,0 +1,28 @@
+require "cask/artifact/app"
+require "cask/artifact/artifact" # generic 'artifact' stanza
+require "cask/artifact/binary"
+require "cask/artifact/colorpicker"
+require "cask/artifact/dictionary"
+require "cask/artifact/font"
+require "cask/artifact/input_method"
+require "cask/artifact/installer"
+require "cask/artifact/internet_plugin"
+require "cask/artifact/audio_unit_plugin"
+require "cask/artifact/vst_plugin"
+require "cask/artifact/vst3_plugin"
+require "cask/artifact/pkg"
+require "cask/artifact/postflight_block"
+require "cask/artifact/preflight_block"
+require "cask/artifact/prefpane"
+require "cask/artifact/qlplugin"
+require "cask/artifact/screen_saver"
+require "cask/artifact/service"
+require "cask/artifact/stage_only"
+require "cask/artifact/suite"
+require "cask/artifact/uninstall"
+require "cask/artifact/zap"
+
+module Hbc
+  module Artifact
+  end
+end
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/abstract_artifact.rb b/Library/Homebrew/cask/artifact/abstract_artifact.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/artifact/abstract_artifact.rb
rename to Library/Homebrew/cask/artifact/abstract_artifact.rb
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/abstract_flight_block.rb b/Library/Homebrew/cask/artifact/abstract_flight_block.rb
similarity index 96%
rename from Library/Homebrew/cask/lib/hbc/artifact/abstract_flight_block.rb
rename to Library/Homebrew/cask/artifact/abstract_flight_block.rb
index aa5b959401..ae4d1451ca 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/abstract_flight_block.rb
+++ b/Library/Homebrew/cask/artifact/abstract_flight_block.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/abstract_artifact"
+require "cask/artifact/abstract_artifact"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/abstract_uninstall.rb b/Library/Homebrew/cask/artifact/abstract_uninstall.rb
similarity index 99%
rename from Library/Homebrew/cask/lib/hbc/artifact/abstract_uninstall.rb
rename to Library/Homebrew/cask/artifact/abstract_uninstall.rb
index 6e03d62a75..d15f078262 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/abstract_uninstall.rb
+++ b/Library/Homebrew/cask/artifact/abstract_uninstall.rb
@@ -1,6 +1,6 @@
 require "timeout"
 
-require "hbc/artifact/abstract_artifact"
+require "cask/artifact/abstract_artifact"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/app.rb b/Library/Homebrew/cask/artifact/app.rb
similarity index 70%
rename from Library/Homebrew/cask/lib/hbc/artifact/app.rb
rename to Library/Homebrew/cask/artifact/app.rb
index cc6ef61a73..eb189fea4e 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/app.rb
+++ b/Library/Homebrew/cask/artifact/app.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/artifact.rb b/Library/Homebrew/cask/artifact/artifact.rb
similarity index 96%
rename from Library/Homebrew/cask/lib/hbc/artifact/artifact.rb
rename to Library/Homebrew/cask/artifact/artifact.rb
index f61e997019..51f8386819 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/artifact.rb
+++ b/Library/Homebrew/cask/artifact/artifact.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 require "extend/hash_validator"
 using HashValidator
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/audio_unit_plugin.rb b/Library/Homebrew/cask/artifact/audio_unit_plugin.rb
similarity index 73%
rename from Library/Homebrew/cask/lib/hbc/artifact/audio_unit_plugin.rb
rename to Library/Homebrew/cask/artifact/audio_unit_plugin.rb
index 3bad78073b..79fac1b3a5 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/audio_unit_plugin.rb
+++ b/Library/Homebrew/cask/artifact/audio_unit_plugin.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/binary.rb b/Library/Homebrew/cask/artifact/binary.rb
similarity index 91%
rename from Library/Homebrew/cask/lib/hbc/artifact/binary.rb
rename to Library/Homebrew/cask/artifact/binary.rb
index 68f4b074da..ad059f7770 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/binary.rb
+++ b/Library/Homebrew/cask/artifact/binary.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/symlinked"
+require "cask/artifact/symlinked"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/colorpicker.rb b/Library/Homebrew/cask/artifact/colorpicker.rb
similarity index 72%
rename from Library/Homebrew/cask/lib/hbc/artifact/colorpicker.rb
rename to Library/Homebrew/cask/artifact/colorpicker.rb
index a866e64a5f..1e1adbcea2 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/colorpicker.rb
+++ b/Library/Homebrew/cask/artifact/colorpicker.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/dictionary.rb b/Library/Homebrew/cask/artifact/dictionary.rb
similarity index 71%
rename from Library/Homebrew/cask/lib/hbc/artifact/dictionary.rb
rename to Library/Homebrew/cask/artifact/dictionary.rb
index e017992f02..4ac499738e 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/dictionary.rb
+++ b/Library/Homebrew/cask/artifact/dictionary.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/font.rb b/Library/Homebrew/cask/artifact/font.rb
similarity index 70%
rename from Library/Homebrew/cask/lib/hbc/artifact/font.rb
rename to Library/Homebrew/cask/artifact/font.rb
index 5c64869b6d..81e6f436be 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/font.rb
+++ b/Library/Homebrew/cask/artifact/font.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/input_method.rb b/Library/Homebrew/cask/artifact/input_method.rb
similarity index 72%
rename from Library/Homebrew/cask/lib/hbc/artifact/input_method.rb
rename to Library/Homebrew/cask/artifact/input_method.rb
index 0eb75a6c02..444b8238d3 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/input_method.rb
+++ b/Library/Homebrew/cask/artifact/input_method.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/installer.rb b/Library/Homebrew/cask/artifact/installer.rb
similarity index 98%
rename from Library/Homebrew/cask/lib/hbc/artifact/installer.rb
rename to Library/Homebrew/cask/artifact/installer.rb
index 55102b1432..8c1e72295b 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/installer.rb
+++ b/Library/Homebrew/cask/artifact/installer.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/abstract_artifact"
+require "cask/artifact/abstract_artifact"
 
 require "extend/hash_validator"
 using HashValidator
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/internet_plugin.rb b/Library/Homebrew/cask/artifact/internet_plugin.rb
similarity index 72%
rename from Library/Homebrew/cask/lib/hbc/artifact/internet_plugin.rb
rename to Library/Homebrew/cask/artifact/internet_plugin.rb
index ab8586d699..2f232874cd 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/internet_plugin.rb
+++ b/Library/Homebrew/cask/artifact/internet_plugin.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/moved.rb b/Library/Homebrew/cask/artifact/moved.rb
similarity index 98%
rename from Library/Homebrew/cask/lib/hbc/artifact/moved.rb
rename to Library/Homebrew/cask/artifact/moved.rb
index 88323f7177..a3730bfc55 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/moved.rb
+++ b/Library/Homebrew/cask/artifact/moved.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/relocated"
+require "cask/artifact/relocated"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/pkg.rb b/Library/Homebrew/cask/artifact/pkg.rb
similarity index 98%
rename from Library/Homebrew/cask/lib/hbc/artifact/pkg.rb
rename to Library/Homebrew/cask/artifact/pkg.rb
index 81b6e4d116..21f9280c46 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/pkg.rb
+++ b/Library/Homebrew/cask/artifact/pkg.rb
@@ -1,6 +1,6 @@
 require "vendor/plist/plist"
 
-require "hbc/artifact/abstract_artifact"
+require "cask/artifact/abstract_artifact"
 
 require "extend/hash_validator"
 using HashValidator
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/postflight_block.rb b/Library/Homebrew/cask/artifact/postflight_block.rb
similarity index 67%
rename from Library/Homebrew/cask/lib/hbc/artifact/postflight_block.rb
rename to Library/Homebrew/cask/artifact/postflight_block.rb
index bfe218f958..9233343561 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/postflight_block.rb
+++ b/Library/Homebrew/cask/artifact/postflight_block.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/abstract_flight_block"
+require "cask/artifact/abstract_flight_block"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/preflight_block.rb b/Library/Homebrew/cask/artifact/preflight_block.rb
similarity index 67%
rename from Library/Homebrew/cask/lib/hbc/artifact/preflight_block.rb
rename to Library/Homebrew/cask/artifact/preflight_block.rb
index 35142df47d..80356bdd44 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/preflight_block.rb
+++ b/Library/Homebrew/cask/artifact/preflight_block.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/abstract_flight_block"
+require "cask/artifact/abstract_flight_block"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/prefpane.rb b/Library/Homebrew/cask/artifact/prefpane.rb
similarity index 82%
rename from Library/Homebrew/cask/lib/hbc/artifact/prefpane.rb
rename to Library/Homebrew/cask/artifact/prefpane.rb
index 87f120934d..ca06a0407c 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/prefpane.rb
+++ b/Library/Homebrew/cask/artifact/prefpane.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/qlplugin.rb b/Library/Homebrew/cask/artifact/qlplugin.rb
similarity index 94%
rename from Library/Homebrew/cask/lib/hbc/artifact/qlplugin.rb
rename to Library/Homebrew/cask/artifact/qlplugin.rb
index 298714d894..0a5766e4b8 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/qlplugin.rb
+++ b/Library/Homebrew/cask/artifact/qlplugin.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/relocated.rb b/Library/Homebrew/cask/artifact/relocated.rb
similarity index 98%
rename from Library/Homebrew/cask/lib/hbc/artifact/relocated.rb
rename to Library/Homebrew/cask/artifact/relocated.rb
index b9d897983b..ae3be9eebb 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/relocated.rb
+++ b/Library/Homebrew/cask/artifact/relocated.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/abstract_artifact"
+require "cask/artifact/abstract_artifact"
 
 require "extend/hash_validator"
 using HashValidator
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/screen_saver.rb b/Library/Homebrew/cask/artifact/screen_saver.rb
similarity index 72%
rename from Library/Homebrew/cask/lib/hbc/artifact/screen_saver.rb
rename to Library/Homebrew/cask/artifact/screen_saver.rb
index 4cdc6037c5..5526f6dcd1 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/screen_saver.rb
+++ b/Library/Homebrew/cask/artifact/screen_saver.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/service.rb b/Library/Homebrew/cask/artifact/service.rb
similarity index 71%
rename from Library/Homebrew/cask/lib/hbc/artifact/service.rb
rename to Library/Homebrew/cask/artifact/service.rb
index 1af93c5334..b92c99efdd 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/service.rb
+++ b/Library/Homebrew/cask/artifact/service.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/stage_only.rb b/Library/Homebrew/cask/artifact/stage_only.rb
similarity index 90%
rename from Library/Homebrew/cask/lib/hbc/artifact/stage_only.rb
rename to Library/Homebrew/cask/artifact/stage_only.rb
index 8c32a52d08..1da1ceff6e 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/stage_only.rb
+++ b/Library/Homebrew/cask/artifact/stage_only.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/abstract_artifact"
+require "cask/artifact/abstract_artifact"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/suite.rb b/Library/Homebrew/cask/artifact/suite.rb
similarity index 85%
rename from Library/Homebrew/cask/lib/hbc/artifact/suite.rb
rename to Library/Homebrew/cask/artifact/suite.rb
index 59ae58cf13..b8a6011d77 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/suite.rb
+++ b/Library/Homebrew/cask/artifact/suite.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/symlinked.rb b/Library/Homebrew/cask/artifact/symlinked.rb
similarity index 98%
rename from Library/Homebrew/cask/lib/hbc/artifact/symlinked.rb
rename to Library/Homebrew/cask/artifact/symlinked.rb
index 5146a8ddb7..690fb76487 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/symlinked.rb
+++ b/Library/Homebrew/cask/artifact/symlinked.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/relocated"
+require "cask/artifact/relocated"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/uninstall.rb b/Library/Homebrew/cask/artifact/uninstall.rb
similarity index 81%
rename from Library/Homebrew/cask/lib/hbc/artifact/uninstall.rb
rename to Library/Homebrew/cask/artifact/uninstall.rb
index 2bbf82862a..41e8fd9d5b 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/uninstall.rb
+++ b/Library/Homebrew/cask/artifact/uninstall.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/abstract_uninstall"
+require "cask/artifact/abstract_uninstall"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/vst3_plugin.rb b/Library/Homebrew/cask/artifact/vst3_plugin.rb
similarity index 71%
rename from Library/Homebrew/cask/lib/hbc/artifact/vst3_plugin.rb
rename to Library/Homebrew/cask/artifact/vst3_plugin.rb
index 056fffc2a9..96ad48fe51 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/vst3_plugin.rb
+++ b/Library/Homebrew/cask/artifact/vst3_plugin.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/vst_plugin.rb b/Library/Homebrew/cask/artifact/vst_plugin.rb
similarity index 71%
rename from Library/Homebrew/cask/lib/hbc/artifact/vst_plugin.rb
rename to Library/Homebrew/cask/artifact/vst_plugin.rb
index f388046359..e8e891e34a 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/vst_plugin.rb
+++ b/Library/Homebrew/cask/artifact/vst_plugin.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/zap.rb b/Library/Homebrew/cask/artifact/zap.rb
similarity index 80%
rename from Library/Homebrew/cask/lib/hbc/artifact/zap.rb
rename to Library/Homebrew/cask/artifact/zap.rb
index 31ff54d201..057f5dd6cf 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/zap.rb
+++ b/Library/Homebrew/cask/artifact/zap.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/abstract_uninstall"
+require "cask/artifact/abstract_uninstall"
 
 module Hbc
   module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/audit.rb b/Library/Homebrew/cask/audit.rb
similarity index 99%
rename from Library/Homebrew/cask/lib/hbc/audit.rb
rename to Library/Homebrew/cask/audit.rb
index 2f596f0d10..ec7def3952 100644
--- a/Library/Homebrew/cask/lib/hbc/audit.rb
+++ b/Library/Homebrew/cask/audit.rb
@@ -1,5 +1,5 @@
-require "hbc/checkable"
-require "hbc/download"
+require "cask/checkable"
+require "cask/download"
 require "digest"
 require "utils/git"
 
diff --git a/Library/Homebrew/cask/lib/hbc/auditor.rb b/Library/Homebrew/cask/auditor.rb
similarity index 98%
rename from Library/Homebrew/cask/lib/hbc/auditor.rb
rename to Library/Homebrew/cask/auditor.rb
index 7eb8715008..014accd3d4 100644
--- a/Library/Homebrew/cask/lib/hbc/auditor.rb
+++ b/Library/Homebrew/cask/auditor.rb
@@ -1,4 +1,4 @@
-require "hbc/download"
+require "cask/download"
 
 module Hbc
   class Auditor
diff --git a/Library/Homebrew/cask/lib/hbc/cache.rb b/Library/Homebrew/cask/cache.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cache.rb
rename to Library/Homebrew/cask/cache.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cask.rb b/Library/Homebrew/cask/cask.rb
similarity index 97%
rename from Library/Homebrew/cask/lib/hbc/cask.rb
rename to Library/Homebrew/cask/cask.rb
index b289fa8bde..c951dbde0e 100644
--- a/Library/Homebrew/cask/lib/hbc/cask.rb
+++ b/Library/Homebrew/cask/cask.rb
@@ -1,7 +1,7 @@
-require "hbc/cask_loader"
-require "hbc/config"
-require "hbc/dsl"
-require "hbc/metadata"
+require "cask/cask_loader"
+require "cask/config"
+require "cask/dsl"
+require "cask/metadata"
 require "searchable"
 
 module Hbc
diff --git a/Library/Homebrew/cask/lib/hbc/cask_dependencies.rb b/Library/Homebrew/cask/cask_dependencies.rb
similarity index 96%
rename from Library/Homebrew/cask/lib/hbc/cask_dependencies.rb
rename to Library/Homebrew/cask/cask_dependencies.rb
index 0edda074e3..7e838d1457 100644
--- a/Library/Homebrew/cask/lib/hbc/cask_dependencies.rb
+++ b/Library/Homebrew/cask/cask_dependencies.rb
@@ -1,6 +1,6 @@
 require "delegate"
 
-require "hbc/topological_hash"
+require "cask/topological_hash"
 
 module Hbc
   class CaskDependencies < DelegateClass(Array)
diff --git a/Library/Homebrew/cask/lib/hbc/cask_loader.rb b/Library/Homebrew/cask/cask_loader.rb
similarity index 99%
rename from Library/Homebrew/cask/lib/hbc/cask_loader.rb
rename to Library/Homebrew/cask/cask_loader.rb
index abbde664eb..c64c60e3fc 100644
--- a/Library/Homebrew/cask/lib/hbc/cask_loader.rb
+++ b/Library/Homebrew/cask/cask_loader.rb
@@ -1,4 +1,4 @@
-require "hbc/cask"
+require "cask/cask"
 require "uri"
 
 module Hbc
diff --git a/Library/Homebrew/cask/lib/hbc/caskroom.rb b/Library/Homebrew/cask/caskroom.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/caskroom.rb
rename to Library/Homebrew/cask/caskroom.rb
diff --git a/Library/Homebrew/cask/lib/hbc/checkable.rb b/Library/Homebrew/cask/checkable.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/checkable.rb
rename to Library/Homebrew/cask/checkable.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli.rb b/Library/Homebrew/cask/cli.rb
similarity index 91%
rename from Library/Homebrew/cask/lib/hbc/cli.rb
rename to Library/Homebrew/cask/cli.rb
index 34e9d6904a..ee2176761d 100644
--- a/Library/Homebrew/cask/lib/hbc/cli.rb
+++ b/Library/Homebrew/cask/cli.rb
@@ -3,32 +3,32 @@ require "shellwords"
 
 require "extend/optparse"
 
-require "hbc/config"
+require "cask/config"
 
-require "hbc/cli/options"
+require "cask/cli/options"
 
-require "hbc/cli/abstract_command"
-require "hbc/cli/audit"
-require "hbc/cli/cat"
-require "hbc/cli/create"
-require "hbc/cli/doctor"
-require "hbc/cli/edit"
-require "hbc/cli/fetch"
-require "hbc/cli/home"
-require "hbc/cli/info"
-require "hbc/cli/install"
-require "hbc/cli/list"
-require "hbc/cli/outdated"
-require "hbc/cli/reinstall"
-require "hbc/cli/style"
-require "hbc/cli/uninstall"
-require "hbc/cli/upgrade"
-require "hbc/cli/--version"
-require "hbc/cli/zap"
+require "cask/cli/abstract_command"
+require "cask/cli/audit"
+require "cask/cli/cat"
+require "cask/cli/create"
+require "cask/cli/doctor"
+require "cask/cli/edit"
+require "cask/cli/fetch"
+require "cask/cli/home"
+require "cask/cli/info"
+require "cask/cli/install"
+require "cask/cli/list"
+require "cask/cli/outdated"
+require "cask/cli/reinstall"
+require "cask/cli/style"
+require "cask/cli/uninstall"
+require "cask/cli/upgrade"
+require "cask/cli/--version"
+require "cask/cli/zap"
 
-require "hbc/cli/abstract_internal_command"
-require "hbc/cli/internal_help"
-require "hbc/cli/internal_stanza"
+require "cask/cli/abstract_internal_command"
+require "cask/cli/internal_help"
+require "cask/cli/internal_stanza"
 
 module Hbc
   class CLI
diff --git a/Library/Homebrew/cask/lib/hbc/cli/--version.rb b/Library/Homebrew/cask/cli/--version.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/--version.rb
rename to Library/Homebrew/cask/cli/--version.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/abstract_command.rb b/Library/Homebrew/cask/cli/abstract_command.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/abstract_command.rb
rename to Library/Homebrew/cask/cli/abstract_command.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/abstract_internal_command.rb b/Library/Homebrew/cask/cli/abstract_internal_command.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/abstract_internal_command.rb
rename to Library/Homebrew/cask/cli/abstract_internal_command.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/audit.rb b/Library/Homebrew/cask/cli/audit.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/audit.rb
rename to Library/Homebrew/cask/cli/audit.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/cat.rb b/Library/Homebrew/cask/cli/cat.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/cat.rb
rename to Library/Homebrew/cask/cli/cat.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/create.rb b/Library/Homebrew/cask/cli/create.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/create.rb
rename to Library/Homebrew/cask/cli/create.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/doctor.rb b/Library/Homebrew/cask/cli/doctor.rb
similarity index 99%
rename from Library/Homebrew/cask/lib/hbc/cli/doctor.rb
rename to Library/Homebrew/cask/cli/doctor.rb
index 8d2ec08acd..c19b53b331 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/doctor.rb
+++ b/Library/Homebrew/cask/cli/doctor.rb
@@ -1,5 +1,5 @@
 require "system_config"
-require "hbc/checkable"
+require "cask/checkable"
 
 module Hbc
   class CLI
diff --git a/Library/Homebrew/cask/lib/hbc/cli/edit.rb b/Library/Homebrew/cask/cli/edit.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/edit.rb
rename to Library/Homebrew/cask/cli/edit.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/fetch.rb b/Library/Homebrew/cask/cli/fetch.rb
similarity index 96%
rename from Library/Homebrew/cask/lib/hbc/cli/fetch.rb
rename to Library/Homebrew/cask/cli/fetch.rb
index 927a3d7139..5346d33dab 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/fetch.rb
+++ b/Library/Homebrew/cask/cli/fetch.rb
@@ -1,4 +1,4 @@
-require "hbc/download"
+require "cask/download"
 
 module Hbc
   class CLI
diff --git a/Library/Homebrew/cask/lib/hbc/cli/home.rb b/Library/Homebrew/cask/cli/home.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/home.rb
rename to Library/Homebrew/cask/cli/home.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/info.rb b/Library/Homebrew/cask/cli/info.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/info.rb
rename to Library/Homebrew/cask/cli/info.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/install.rb b/Library/Homebrew/cask/cli/install.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/install.rb
rename to Library/Homebrew/cask/cli/install.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/internal_help.rb b/Library/Homebrew/cask/cli/internal_help.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/internal_help.rb
rename to Library/Homebrew/cask/cli/internal_help.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/internal_stanza.rb b/Library/Homebrew/cask/cli/internal_stanza.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/internal_stanza.rb
rename to Library/Homebrew/cask/cli/internal_stanza.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/list.rb b/Library/Homebrew/cask/cli/list.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/list.rb
rename to Library/Homebrew/cask/cli/list.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/options.rb b/Library/Homebrew/cask/cli/options.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/options.rb
rename to Library/Homebrew/cask/cli/options.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/outdated.rb b/Library/Homebrew/cask/cli/outdated.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/outdated.rb
rename to Library/Homebrew/cask/cli/outdated.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb b/Library/Homebrew/cask/cli/reinstall.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/reinstall.rb
rename to Library/Homebrew/cask/cli/reinstall.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/style.rb b/Library/Homebrew/cask/cli/style.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/style.rb
rename to Library/Homebrew/cask/cli/style.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/uninstall.rb b/Library/Homebrew/cask/cli/uninstall.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/uninstall.rb
rename to Library/Homebrew/cask/cli/uninstall.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/upgrade.rb b/Library/Homebrew/cask/cli/upgrade.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/upgrade.rb
rename to Library/Homebrew/cask/cli/upgrade.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/zap.rb b/Library/Homebrew/cask/cli/zap.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/zap.rb
rename to Library/Homebrew/cask/cli/zap.rb
diff --git a/Library/Homebrew/cask/lib/hbc/config.rb b/Library/Homebrew/cask/config.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/config.rb
rename to Library/Homebrew/cask/config.rb
diff --git a/Library/Homebrew/cask/lib/hbc/download.rb b/Library/Homebrew/cask/download.rb
similarity index 94%
rename from Library/Homebrew/cask/lib/hbc/download.rb
rename to Library/Homebrew/cask/download.rb
index 65a44e0c7f..1446d40dae 100644
--- a/Library/Homebrew/cask/lib/hbc/download.rb
+++ b/Library/Homebrew/cask/download.rb
@@ -1,7 +1,7 @@
 require "fileutils"
-require "hbc/cache"
-require "hbc/quarantine"
-require "hbc/verify"
+require "cask/cache"
+require "cask/quarantine"
+require "cask/verify"
 
 module Hbc
   class Download
diff --git a/Library/Homebrew/cask/lib/hbc/dsl.rb b/Library/Homebrew/cask/dsl.rb
similarity index 94%
rename from Library/Homebrew/cask/lib/hbc/dsl.rb
rename to Library/Homebrew/cask/dsl.rb
index 864e6247db..eac2880d0b 100644
--- a/Library/Homebrew/cask/lib/hbc/dsl.rb
+++ b/Library/Homebrew/cask/dsl.rb
@@ -1,24 +1,24 @@
 require "locale"
 require "lazy_object"
 
-require "hbc/artifact"
+require "cask/artifact"
 
-require "hbc/caskroom"
-require "hbc/exceptions"
+require "cask/caskroom"
+require "cask/exceptions"
 
-require "hbc/dsl/appcast"
-require "hbc/dsl/base"
-require "hbc/dsl/caveats"
-require "hbc/dsl/conflicts_with"
-require "hbc/dsl/container"
-require "hbc/dsl/depends_on"
-require "hbc/dsl/postflight"
-require "hbc/dsl/preflight"
-require "hbc/dsl/uninstall_postflight"
-require "hbc/dsl/uninstall_preflight"
-require "hbc/dsl/version"
+require "cask/dsl/appcast"
+require "cask/dsl/base"
+require "cask/dsl/caveats"
+require "cask/dsl/conflicts_with"
+require "cask/dsl/container"
+require "cask/dsl/depends_on"
+require "cask/dsl/postflight"
+require "cask/dsl/preflight"
+require "cask/dsl/uninstall_postflight"
+require "cask/dsl/uninstall_preflight"
+require "cask/dsl/version"
 
-require "hbc/url"
+require "cask/url"
 
 module Hbc
   class DSL
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/appcast.rb b/Library/Homebrew/cask/dsl/appcast.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/dsl/appcast.rb
rename to Library/Homebrew/cask/dsl/appcast.rb
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/base.rb b/Library/Homebrew/cask/dsl/base.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/dsl/base.rb
rename to Library/Homebrew/cask/dsl/base.rb
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/caveats.rb b/Library/Homebrew/cask/dsl/caveats.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/dsl/caveats.rb
rename to Library/Homebrew/cask/dsl/caveats.rb
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/conflicts_with.rb b/Library/Homebrew/cask/dsl/conflicts_with.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/dsl/conflicts_with.rb
rename to Library/Homebrew/cask/dsl/conflicts_with.rb
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/container.rb b/Library/Homebrew/cask/dsl/container.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/dsl/container.rb
rename to Library/Homebrew/cask/dsl/container.rb
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/depends_on.rb b/Library/Homebrew/cask/dsl/depends_on.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/dsl/depends_on.rb
rename to Library/Homebrew/cask/dsl/depends_on.rb
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/postflight.rb b/Library/Homebrew/cask/dsl/postflight.rb
similarity index 91%
rename from Library/Homebrew/cask/lib/hbc/dsl/postflight.rb
rename to Library/Homebrew/cask/dsl/postflight.rb
index 1026f6de60..63ce8f6318 100644
--- a/Library/Homebrew/cask/lib/hbc/dsl/postflight.rb
+++ b/Library/Homebrew/cask/dsl/postflight.rb
@@ -1,4 +1,4 @@
-require "hbc/staged"
+require "cask/staged"
 
 module Hbc
   class DSL
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/preflight.rb b/Library/Homebrew/cask/dsl/preflight.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/dsl/preflight.rb
rename to Library/Homebrew/cask/dsl/preflight.rb
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/uninstall_postflight.rb b/Library/Homebrew/cask/dsl/uninstall_postflight.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/dsl/uninstall_postflight.rb
rename to Library/Homebrew/cask/dsl/uninstall_postflight.rb
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/uninstall_preflight.rb b/Library/Homebrew/cask/dsl/uninstall_preflight.rb
similarity index 81%
rename from Library/Homebrew/cask/lib/hbc/dsl/uninstall_preflight.rb
rename to Library/Homebrew/cask/dsl/uninstall_preflight.rb
index 36cdec12f5..5e00a2790f 100644
--- a/Library/Homebrew/cask/lib/hbc/dsl/uninstall_preflight.rb
+++ b/Library/Homebrew/cask/dsl/uninstall_preflight.rb
@@ -1,4 +1,4 @@
-require "hbc/staged"
+require "cask/staged"
 
 module Hbc
   class DSL
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/version.rb b/Library/Homebrew/cask/dsl/version.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/dsl/version.rb
rename to Library/Homebrew/cask/dsl/version.rb
diff --git a/Library/Homebrew/cask/lib/hbc/exceptions.rb b/Library/Homebrew/cask/exceptions.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/exceptions.rb
rename to Library/Homebrew/cask/exceptions.rb
diff --git a/Library/Homebrew/cask/lib/hbc/installer.rb b/Library/Homebrew/cask/installer.rb
similarity index 99%
rename from Library/Homebrew/cask/lib/hbc/installer.rb
rename to Library/Homebrew/cask/installer.rb
index 68d1251a79..52b9c340ba 100644
--- a/Library/Homebrew/cask/lib/hbc/installer.rb
+++ b/Library/Homebrew/cask/installer.rb
@@ -3,11 +3,11 @@ require "rubygems"
 require "formula_installer"
 require "unpack_strategy"
 
-require "hbc/cask_dependencies"
-require "hbc/download"
-require "hbc/staged"
-require "hbc/verify"
-require "hbc/quarantine"
+require "cask/cask_dependencies"
+require "cask/download"
+require "cask/staged"
+require "cask/verify"
+require "cask/quarantine"
 
 require "cgi"
 
diff --git a/Library/Homebrew/cask/lib/hbc.rb b/Library/Homebrew/cask/lib/hbc.rb
deleted file mode 100644
index 8eca398094..0000000000
--- a/Library/Homebrew/cask/lib/hbc.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require "hardware"
-
-require "hbc/artifact"
-require "hbc/audit"
-require "hbc/auditor"
-require "hbc/cache"
-require "hbc/cask"
-require "hbc/cask_loader"
-require "hbc/caskroom"
-require "hbc/checkable"
-require "hbc/cli"
-require "hbc/cask_dependencies"
-require "hbc/exceptions"
-require "hbc/installer"
-require "hbc/macos"
-require "hbc/pkg"
-require "hbc/staged"
-require "hbc/topological_hash"
-require "hbc/utils"
-require "hbc/verify"
-require "hbc/version"
diff --git a/Library/Homebrew/cask/lib/hbc/artifact.rb b/Library/Homebrew/cask/lib/hbc/artifact.rb
deleted file mode 100644
index df1bc9b6a8..0000000000
--- a/Library/Homebrew/cask/lib/hbc/artifact.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require "hbc/artifact/app"
-require "hbc/artifact/artifact" # generic 'artifact' stanza
-require "hbc/artifact/binary"
-require "hbc/artifact/colorpicker"
-require "hbc/artifact/dictionary"
-require "hbc/artifact/font"
-require "hbc/artifact/input_method"
-require "hbc/artifact/installer"
-require "hbc/artifact/internet_plugin"
-require "hbc/artifact/audio_unit_plugin"
-require "hbc/artifact/vst_plugin"
-require "hbc/artifact/vst3_plugin"
-require "hbc/artifact/pkg"
-require "hbc/artifact/postflight_block"
-require "hbc/artifact/preflight_block"
-require "hbc/artifact/prefpane"
-require "hbc/artifact/qlplugin"
-require "hbc/artifact/screen_saver"
-require "hbc/artifact/service"
-require "hbc/artifact/stage_only"
-require "hbc/artifact/suite"
-require "hbc/artifact/uninstall"
-require "hbc/artifact/zap"
-
-module Hbc
-  module Artifact
-  end
-end
diff --git a/Library/Homebrew/cask/lib/hbc/macos.rb b/Library/Homebrew/cask/macos.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/macos.rb
rename to Library/Homebrew/cask/macos.rb
diff --git a/Library/Homebrew/cask/lib/hbc/metadata.rb b/Library/Homebrew/cask/metadata.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/metadata.rb
rename to Library/Homebrew/cask/metadata.rb
diff --git a/Library/Homebrew/cask/lib/hbc/pkg.rb b/Library/Homebrew/cask/pkg.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/pkg.rb
rename to Library/Homebrew/cask/pkg.rb
diff --git a/Library/Homebrew/cask/lib/hbc/quarantine.rb b/Library/Homebrew/cask/quarantine.rb
similarity index 95%
rename from Library/Homebrew/cask/lib/hbc/quarantine.rb
rename to Library/Homebrew/cask/quarantine.rb
index 952803a68d..c55a93e6a8 100644
--- a/Library/Homebrew/cask/lib/hbc/quarantine.rb
+++ b/Library/Homebrew/cask/quarantine.rb
@@ -5,7 +5,7 @@ module Hbc
 
     QUARANTINE_ATTRIBUTE = "com.apple.quarantine".freeze
 
-    QUARANTINE_SCRIPT = (HOMEBREW_LIBRARY_PATH/"cask/lib/hbc/utils/quarantine.swift").freeze
+    QUARANTINE_SCRIPT = (HOMEBREW_LIBRARY_PATH/"cask/utils/quarantine.swift").freeze
 
     # @private
     def swift
diff --git a/Library/Homebrew/cask/lib/hbc/staged.rb b/Library/Homebrew/cask/staged.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/staged.rb
rename to Library/Homebrew/cask/staged.rb
diff --git a/Library/Homebrew/cask/lib/hbc/topological_hash.rb b/Library/Homebrew/cask/topological_hash.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/topological_hash.rb
rename to Library/Homebrew/cask/topological_hash.rb
diff --git a/Library/Homebrew/cask/lib/hbc/url.rb b/Library/Homebrew/cask/url.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/url.rb
rename to Library/Homebrew/cask/url.rb
diff --git a/Library/Homebrew/cask/lib/hbc/utils.rb b/Library/Homebrew/cask/utils.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/utils.rb
rename to Library/Homebrew/cask/utils.rb
diff --git a/Library/Homebrew/cask/lib/hbc/utils/quarantine.swift b/Library/Homebrew/cask/utils/quarantine.swift
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/utils/quarantine.swift
rename to Library/Homebrew/cask/utils/quarantine.swift
diff --git a/Library/Homebrew/cask/lib/hbc/verify.rb b/Library/Homebrew/cask/verify.rb
similarity index 96%
rename from Library/Homebrew/cask/lib/hbc/verify.rb
rename to Library/Homebrew/cask/verify.rb
index c5c6566731..94c11701bd 100644
--- a/Library/Homebrew/cask/lib/hbc/verify.rb
+++ b/Library/Homebrew/cask/verify.rb
@@ -1,4 +1,4 @@
-require "hbc/verify/checksum"
+require "cask/verify/checksum"
 
 module Hbc
   module Verify
diff --git a/Library/Homebrew/cask/lib/hbc/verify/checksum.rb b/Library/Homebrew/cask/verify/checksum.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/verify/checksum.rb
rename to Library/Homebrew/cask/verify/checksum.rb
diff --git a/Library/Homebrew/cask/lib/hbc/version.rb b/Library/Homebrew/cask/version.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/version.rb
rename to Library/Homebrew/cask/version.rb
diff --git a/Library/Homebrew/cleanup.rb b/Library/Homebrew/cleanup.rb
index e88aff4076..3e4e624dc2 100644
--- a/Library/Homebrew/cleanup.rb
+++ b/Library/Homebrew/cleanup.rb
@@ -1,6 +1,6 @@
 require "utils/bottles"
 require "formula"
-require "hbc/cask_loader"
+require "cask/cask_loader"
 require "set"
 
 module CleanupRefinement
diff --git a/Library/Homebrew/cmd/cask.rb b/Library/Homebrew/cmd/cask.rb
index b07e681deb..9291241595 100644
--- a/Library/Homebrew/cmd/cask.rb
+++ b/Library/Homebrew/cmd/cask.rb
@@ -1,4 +1,4 @@
-require "hbc"
+require "cask/all"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/compat.rb b/Library/Homebrew/compat.rb
index fbb74cb546..cf048d1beb 100644
--- a/Library/Homebrew/compat.rb
+++ b/Library/Homebrew/compat.rb
@@ -3,5 +3,5 @@ require "compat/dependable"
 require "compat/dependency_collector"
 require "compat/fileutils"
 require "compat/formula_support"
-require "compat/hbc"
+require "compat/cask"
 require "compat/tap"
diff --git a/Library/Homebrew/compat/hbc.rb b/Library/Homebrew/compat/cask.rb
similarity index 57%
rename from Library/Homebrew/compat/hbc.rb
rename to Library/Homebrew/compat/cask.rb
index f254a27360..3a2c689733 100644
--- a/Library/Homebrew/compat/hbc.rb
+++ b/Library/Homebrew/compat/cask.rb
@@ -1,9 +1,9 @@
-require "compat/hbc/cask_loader"
-require "compat/hbc/cli/cleanup"
-require "compat/hbc/cli/search"
-require "compat/hbc/cache"
-require "compat/hbc/caskroom"
-require "compat/hbc/dsl"
+require "compat/cask/cask_loader"
+require "compat/cask/cli/cleanup"
+require "compat/cask/cli/search"
+require "compat/cask/cache"
+require "compat/cask/caskroom"
+require "compat/cask/dsl"
 
 module Hbc
   class << self
diff --git a/Library/Homebrew/compat/hbc/cache.rb b/Library/Homebrew/compat/cask/cache.rb
similarity index 100%
rename from Library/Homebrew/compat/hbc/cache.rb
rename to Library/Homebrew/compat/cask/cache.rb
diff --git a/Library/Homebrew/compat/hbc/cask_loader.rb b/Library/Homebrew/compat/cask/cask_loader.rb
similarity index 100%
rename from Library/Homebrew/compat/hbc/cask_loader.rb
rename to Library/Homebrew/compat/cask/cask_loader.rb
diff --git a/Library/Homebrew/compat/hbc/caskroom.rb b/Library/Homebrew/compat/cask/caskroom.rb
similarity index 100%
rename from Library/Homebrew/compat/hbc/caskroom.rb
rename to Library/Homebrew/compat/cask/caskroom.rb
diff --git a/Library/Homebrew/compat/hbc/cli/cleanup.rb b/Library/Homebrew/compat/cask/cli/cleanup.rb
similarity index 96%
rename from Library/Homebrew/compat/hbc/cli/cleanup.rb
rename to Library/Homebrew/compat/cask/cli/cleanup.rb
index 49242de783..dccada465d 100644
--- a/Library/Homebrew/compat/hbc/cli/cleanup.rb
+++ b/Library/Homebrew/compat/cask/cli/cleanup.rb
@@ -1,4 +1,4 @@
-require "hbc/cli/abstract_command"
+require "cask/cli/abstract_command"
 require "cleanup"
 
 using CleanupRefinement
diff --git a/Library/Homebrew/compat/hbc/cli/search.rb b/Library/Homebrew/compat/cask/cli/search.rb
similarity index 91%
rename from Library/Homebrew/compat/hbc/cli/search.rb
rename to Library/Homebrew/compat/cask/cli/search.rb
index 8aa761c3c3..cd46f59f53 100644
--- a/Library/Homebrew/compat/hbc/cli/search.rb
+++ b/Library/Homebrew/compat/cask/cli/search.rb
@@ -1,4 +1,4 @@
-require "hbc/cli/abstract_command"
+require "cask/cli/abstract_command"
 require "cmd/search"
 
 module Hbc
diff --git a/Library/Homebrew/compat/hbc/dsl.rb b/Library/Homebrew/compat/cask/dsl.rb
similarity index 100%
rename from Library/Homebrew/compat/hbc/dsl.rb
rename to Library/Homebrew/compat/cask/dsl.rb
diff --git a/Library/Homebrew/dev-cmd/irb.rb b/Library/Homebrew/dev-cmd/irb.rb
index 97a0045826..7f5cd77f15 100644
--- a/Library/Homebrew/dev-cmd/irb.rb
+++ b/Library/Homebrew/dev-cmd/irb.rb
@@ -46,8 +46,7 @@ module Homebrew
 
     require "formula"
     require "keg"
-
-    require "hbc"
+    require "cask/all"
 
     ohai "Interactive Homebrew Shell"
     puts "Example commands available with: brew irb --examples"
diff --git a/Library/Homebrew/extend/os/mac/search.rb b/Library/Homebrew/extend/os/mac/search.rb
index 5d1d7cc78a..9aada104b6 100644
--- a/Library/Homebrew/extend/os/mac/search.rb
+++ b/Library/Homebrew/extend/os/mac/search.rb
@@ -1,5 +1,5 @@
-require "hbc/cask"
-require "hbc/cask_loader"
+require "cask/cask"
+require "cask/cask_loader"
 
 module Homebrew
   module Search
diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb
index ce38bddd59..7517a64ff2 100644
--- a/Library/Homebrew/global.rb
+++ b/Library/Homebrew/global.rb
@@ -3,10 +3,6 @@ require "English"
 
 HOMEBREW_LIBRARY_PATH = Pathname.new(__FILE__).realpath.parent
 
-unless $LOAD_PATH.include?("#{HOMEBREW_LIBRARY_PATH}/cask/lib")
-  $LOAD_PATH.push("#{HOMEBREW_LIBRARY_PATH}/cask/lib")
-end
-
 unless $LOAD_PATH.include?(HOMEBREW_LIBRARY_PATH.to_s)
   $LOAD_PATH.push(HOMEBREW_LIBRARY_PATH.to_s)
 end
diff --git a/Library/Homebrew/test/cask/dsl/caveats_spec.rb b/Library/Homebrew/test/cask/dsl/caveats_spec.rb
index 1b82d98211..f91046e308 100644
--- a/Library/Homebrew/test/cask/dsl/caveats_spec.rb
+++ b/Library/Homebrew/test/cask/dsl/caveats_spec.rb
@@ -1,4 +1,4 @@
-require "test/support/helper/spec/shared_examples/hbc_dsl_base"
+require "test/support/helper/spec/shared_examples/cask_dsl_base"
 
 describe Hbc::DSL::Caveats, :cask do
   let(:cask) { Hbc::CaskLoader.load(cask_path("basic-cask")) }
diff --git a/Library/Homebrew/test/cask/dsl/postflight_spec.rb b/Library/Homebrew/test/cask/dsl/postflight_spec.rb
index a7877d1abf..0fd4c1317f 100644
--- a/Library/Homebrew/test/cask/dsl/postflight_spec.rb
+++ b/Library/Homebrew/test/cask/dsl/postflight_spec.rb
@@ -1,5 +1,5 @@
-require "test/support/helper/spec/shared_examples/hbc_dsl_base"
-require "test/support/helper/spec/shared_examples/hbc_staged"
+require "test/support/helper/spec/shared_examples/cask_dsl_base"
+require "test/support/helper/spec/shared_examples/cask_staged"
 
 describe Hbc::DSL::Postflight, :cask do
   let(:cask) { Hbc::CaskLoader.load(cask_path("basic-cask")) }
diff --git a/Library/Homebrew/test/cask/dsl/preflight_spec.rb b/Library/Homebrew/test/cask/dsl/preflight_spec.rb
index 1d152e06ad..70193154e2 100644
--- a/Library/Homebrew/test/cask/dsl/preflight_spec.rb
+++ b/Library/Homebrew/test/cask/dsl/preflight_spec.rb
@@ -1,5 +1,5 @@
-require "test/support/helper/spec/shared_examples/hbc_dsl_base"
-require "test/support/helper/spec/shared_examples/hbc_staged"
+require "test/support/helper/spec/shared_examples/cask_dsl_base"
+require "test/support/helper/spec/shared_examples/cask_staged"
 
 describe Hbc::DSL::Preflight, :cask do
   let(:cask) { Hbc::CaskLoader.load(cask_path("basic-cask")) }
diff --git a/Library/Homebrew/test/cask/dsl/uninstall_postflight_spec.rb b/Library/Homebrew/test/cask/dsl/uninstall_postflight_spec.rb
index 189e526e29..540e2504a4 100644
--- a/Library/Homebrew/test/cask/dsl/uninstall_postflight_spec.rb
+++ b/Library/Homebrew/test/cask/dsl/uninstall_postflight_spec.rb
@@ -1,4 +1,4 @@
-require "test/support/helper/spec/shared_examples/hbc_dsl_base"
+require "test/support/helper/spec/shared_examples/cask_dsl_base"
 
 describe Hbc::DSL::UninstallPostflight, :cask do
   let(:cask) { Hbc::CaskLoader.load(cask_path("basic-cask")) }
diff --git a/Library/Homebrew/test/cask/dsl/uninstall_preflight_spec.rb b/Library/Homebrew/test/cask/dsl/uninstall_preflight_spec.rb
index 8f4164b07d..ff1fdc63e2 100644
--- a/Library/Homebrew/test/cask/dsl/uninstall_preflight_spec.rb
+++ b/Library/Homebrew/test/cask/dsl/uninstall_preflight_spec.rb
@@ -1,5 +1,5 @@
-require "test/support/helper/spec/shared_examples/hbc_dsl_base"
-require "test/support/helper/spec/shared_examples/hbc_staged"
+require "test/support/helper/spec/shared_examples/cask_dsl_base"
+require "test/support/helper/spec/shared_examples/cask_staged"
 
 describe Hbc::DSL::UninstallPreflight, :cask do
   let(:cask) { Hbc::CaskLoader.load(cask_path("basic-cask")) }
diff --git a/Library/Homebrew/test/cleanup_spec.rb b/Library/Homebrew/test/cleanup_spec.rb
index 18c0c9e51a..6df872f20d 100644
--- a/Library/Homebrew/test/cleanup_spec.rb
+++ b/Library/Homebrew/test/cleanup_spec.rb
@@ -1,6 +1,6 @@
 require "test/support/fixtures/testball"
 require "cleanup"
-require "hbc/cache"
+require "cask/cache"
 require "fileutils"
 
 using CleanupRefinement
diff --git a/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb b/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb
index 3155bf0de3..71816b5bc3 100644
--- a/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb
+++ b/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb
@@ -1,4 +1,4 @@
-require "hbc"
+require "cask/all"
 
 require "test/support/helper/cask/fake_system_command"
 require "test/support/helper/cask/install_helper"
diff --git a/Library/Homebrew/test/support/helper/spec/shared_examples/hbc_dsl_base.rb b/Library/Homebrew/test/support/helper/spec/shared_examples/cask_dsl_base.rb
similarity index 95%
rename from Library/Homebrew/test/support/helper/spec/shared_examples/hbc_dsl_base.rb
rename to Library/Homebrew/test/support/helper/spec/shared_examples/cask_dsl_base.rb
index 400ff40f62..b1431d2bcb 100644
--- a/Library/Homebrew/test/support/helper/spec/shared_examples/hbc_dsl_base.rb
+++ b/Library/Homebrew/test/support/helper/spec/shared_examples/cask_dsl_base.rb
@@ -1,4 +1,4 @@
-require "hbc/dsl/base"
+require "cask/dsl/base"
 
 shared_examples Hbc::DSL::Base do
   it "supports the token method" do
diff --git a/Library/Homebrew/test/support/helper/spec/shared_examples/hbc_staged.rb b/Library/Homebrew/test/support/helper/spec/shared_examples/cask_staged.rb
similarity index 99%
rename from Library/Homebrew/test/support/helper/spec/shared_examples/hbc_staged.rb
rename to Library/Homebrew/test/support/helper/spec/shared_examples/cask_staged.rb
index 1f2eb5b5d0..8d56439895 100644
--- a/Library/Homebrew/test/support/helper/spec/shared_examples/hbc_staged.rb
+++ b/Library/Homebrew/test/support/helper/spec/shared_examples/cask_staged.rb
@@ -1,4 +1,4 @@
-require "hbc/staged"
+require "cask/staged"
 
 shared_examples Hbc::Staged do
   let(:existing_path) { Pathname.new("/path/to/file/that/exists") }
diff --git a/Library/Homebrew/update_migrator.rb b/Library/Homebrew/update_migrator.rb
index a2e5557996..a75e735a09 100644
--- a/Library/Homebrew/update_migrator.rb
+++ b/Library/Homebrew/update_migrator.rb
@@ -1,5 +1,5 @@
-require "hbc/cask_loader"
-require "hbc/download"
+require "cask/cask_loader"
+require "cask/download"
 
 module UpdateMigrator
   class << self