diff --git a/INSTALL b/INSTALL
index 39f7fb2eb..f792aed34 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,25 +1,25 @@
 === Configuration
 
-You should have something like this in config/initializers/hoptoad.rb.
+You should have something like this in config/initializers/airbrake.rb.
 
-  HoptoadNotifier.configure do |config|
+  Airbrake.configure do |config|
     config.api_key = '1234567890abcdef'
   end
 
 (Please note that this configuration should be in a global configuration, and
-is *not* environment-specific. Hoptoad is smart enough to know what errors are
+is *not* environment-specific. Airbrake is smart enough to know what errors are
 caused by what environments, so your staging errors don't get mixed in with
 your production errors.)
 
-You can test that Hoptoad is working in your production environment by using 
+You can test that Airbrake is working in your production environment by using 
 this rake task (from RAILS_ROOT):
 
-  rake hoptoad:test
+  rake airbrake:test
 
-If everything is configured properly, that task will send a notice to Hoptoad 
+If everything is configured properly, that task will send a notice to Airbrake 
 which will be visible immediately.
 
 NOTE FOR RAILS 1.2.* USERS:
 
-You will need to copy the hoptoad_notifier_tasks.rake file into your
-RAILS_ROOT/lib/tasks directory in order for the rake hoptoad:test task to work.
+You will need to copy the airbrake_tasks.rb file into your
+RAILS_ROOT/lib/tasks directory in order for the rake airbrake:test task to work.
diff --git a/README.md b/README.md
index 07ec32dfb..c9f9b70c6 100644
--- a/README.md
+++ b/README.md
@@ -16,15 +16,15 @@ For discussion of Airbrake development check out the [mailing list](http://group
 Rails Installation
 ------------------
 
-### Remove exception_notifier
+### Remove hoptoad_notifier
 
 in your ApplicationController, REMOVE this line:
 
-    include ExceptionNotifiable
+    include HoptoadNotifiable
 
-In your config/environment* files, remove all references to ExceptionNotifier
+In your config/environment* files, remove all references to HoptoadNotifier
 
-Remove the vendor/plugins/exception_notifier directory.
+Remove the vendor/plugins/hoptoad_notifier directory.
 
 ### Remove hoptoad_notifier plugin
 
diff --git a/lib/templates/rescue.erb b/lib/templates/rescue.erb
index c22390d26..4bbab4df0 100644
--- a/lib/templates/rescue.erb
+++ b/lib/templates/rescue.erb
@@ -70,7 +70,7 @@ var Airbrake = {
 };
 
 window.onload = function() {
-  Airbrake.initialize.apply(Hoptoad);
+  Airbrake.initialize.apply(Airbrake);
 };
 </script>