diff --git a/Gemfile.lock b/Gemfile.lock
index f890098..d61cdb7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    paloma (0.0.1)
+    paloma (0.0.2)
 
 GEM
   remote: http://rubygems.org/
diff --git a/lib/paloma.rb b/lib/paloma.rb
index 6731837..1b9eccf 100644
--- a/lib/paloma.rb
+++ b/lib/paloma.rb
@@ -4,10 +4,11 @@ module Paloma
   end
 end
 
-require 'rails/all'
+require 'action_controller/railtie'
+require 'rails/generators'
 
 # TODO: Rails version checking
 
-require 'paloma/paloma_generator'
+require 'paloma/callback_generator'
 require 'paloma/action_controller_filters'
 require 'paloma/action_controller_extension'
diff --git a/lib/paloma/paloma_generator.rb b/lib/paloma/callback_generator.rb
similarity index 87%
rename from lib/paloma/paloma_generator.rb
rename to lib/paloma/callback_generator.rb
index e09a24c..e3f6134 100644
--- a/lib/paloma/paloma_generator.rb
+++ b/lib/paloma/callback_generator.rb
@@ -1,6 +1,6 @@
 module Paloma
 
-  class PalomaGenerator < ::Rails::Generators::NamedBase
+  class CallbackGenerator < ::Rails::Generators::NamedBase
     source_root File.expand_path('../templates', __FILE__)
     
     def copy_initializer_file
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 93e6b36..bfb02f7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,4 @@
-require 'rails'
+require 'rails/all'
 require 'bundler/setup'
 Bundler.require