diff --git a/Aliases/heroku b/Aliases/heroku
deleted file mode 120000
index f950e3611c..0000000000
--- a/Aliases/heroku
+++ /dev/null
@@ -1 +0,0 @@
-../Formula/heroku-toolbelt.rb
\ No newline at end of file
diff --git a/Formula/heroku-toolbelt.rb b/Formula/heroku.rb
similarity index 96%
rename from Formula/heroku-toolbelt.rb
rename to Formula/heroku.rb
index bee160f114..3d673dab72 100644
--- a/Formula/heroku-toolbelt.rb
+++ b/Formula/heroku.rb
@@ -1,4 +1,4 @@
-class HerokuToolbelt < Formula
+class Heroku < Formula
   desc "Everything you need to get started with Heroku"
   homepage "https://toolbelt.heroku.com/other"
   url "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-3.43.0.tgz"
diff --git a/formula_renames.json b/formula_renames.json
index 10bf07d2f1..3286743732 100644
--- a/formula_renames.json
+++ b/formula_renames.json
@@ -9,6 +9,7 @@
   "google-app-engine": "app-engine-python",
   "google-perftools": "gperftools",
   "hamsterdb": "upscaledb",
+  "heroku-toolbelt": "heroku",
   "kotlin-compiler": "kotlin",
   "libcppa": "caf",
   "mpich2": "mpich",