diff --git a/README.rdoc b/README.rdoc
index 5a2968c..270f05d 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -1,5 +1,5 @@
-= event_machine
-With event machine, you can keep an eye on any action on your rails controller, say in your sns website, when user posts a blog, you need to notice all of his friends, but it's really urgly to do like this:
+= enhanced_hooks
+With enhanced hooks, you can keep an eye on any action on your rails controller, say in your sns website, when user posts a blog, you need to notice all of his friends, but it's really urgly to do like this:
 
   BlogController:
     def create
@@ -15,11 +15,11 @@ Usage:
 
 in your Gemfile:
 
-    gem "event_machine", :version => ">=0.4.1"
+    gem "enhanced_hooks", :version => ">=0.4.1"
 
 and the generate command :
 
-  ~your_project_path> rails g event_machine create_favorite Favorites create 
+  ~your_project_path> rails g enhanced_hooks create_favorite Favorites create 
 
 here 'create_event' stands for the event name, and 'Favorites' 'create' for which contorller#action to observe
 
diff --git a/event_machine.gemspec b/event_machine.gemspec
deleted file mode 100644
index 4d9aa64..0000000
--- a/event_machine.gemspec
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'event_machine/version'
-
-Gem::Specification.new do |gem|
-  gem.name          = "event_machine"
-  gem.version       = EventMachine::VERSION
-  gem.authors       = ["tteng"]
-  gem.email         = ["tim.rubist@gmail.com"]
-  gem.description   = %q{simple elegant customize hooks}
-  gem.summary       = %q{simple elegant around filters to handle routines}
-  gem.homepage      = "http://github.com/tteng"
-
-  gem.files         = [
-                        "lib/event_machine.rb", 
-                        "lib/event_machine/engine.rb",
-                        "lib/event_machine/hooks.rb",
-                        "lib/event_machine/version.rb",
-                        "lib/generators/event_machine/event_machine_generator.rb",
-                        "lib/generators/event_machine/templates/event.rb",
-                        "lib/generators/event_machine/templates/functional_test.rb"
-                      ]
-
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
-  gem.add_dependency "activesupport", ">= 3.0.0"
-  gem.add_dependency "rails",  ">= 3.0.0"
-end
diff --git a/lib/enhanced_hooks.rb b/lib/enhanced_hooks.rb
new file mode 100644
index 0000000..71b47a8
--- /dev/null
+++ b/lib/enhanced_hooks.rb
@@ -0,0 +1,15 @@
+require "enhanced_hooks/version"
+require "active_support/dependencies"
+
+module EnhancedHooks
+
+  mattr_accessor :app_root
+
+  def self.setup
+    yield self
+  end
+
+end
+
+require "enhanced_hooks/engine"
+require "enhanced_hooks/hooks"
diff --git a/lib/enhanced_hooks/engine.rb b/lib/enhanced_hooks/engine.rb
new file mode 100644
index 0000000..305bcee
--- /dev/null
+++ b/lib/enhanced_hooks/engine.rb
@@ -0,0 +1,21 @@
+module EnhancedHooks
+  class Engine < Rails::Engine
+
+    initializer "enhanced_hooks.load_app_instance_data" do |app|
+      EnhancedHooks.setup do |config|
+        config.app_root = app.root
+      end
+    end
+
+    #initialize "enhanced_hooks.load_static_assets" do |app| 
+    #  app.middleware.use ::ActionDispatc::Static, "#{root}/public"
+    #end
+
+    initializer "enhanced_hooks.application" do
+      ActiveSupport.on_load :action_controller do
+        include EnhancedHooks::Hooks
+      end
+    end
+   
+  end
+end
diff --git a/lib/event_machine/hooks.rb b/lib/enhanced_hooks/hooks.rb
similarity index 94%
rename from lib/event_machine/hooks.rb
rename to lib/enhanced_hooks/hooks.rb
index 93ec4ad..42e2378 100644
--- a/lib/event_machine/hooks.rb
+++ b/lib/enhanced_hooks/hooks.rb
@@ -1,7 +1,7 @@
 require "pp"
 require 'benchmark'
 
-module EventMachine 
+module EnhancedHooks 
 
   module Hooks
     
diff --git a/lib/event_machine/version.rb b/lib/enhanced_hooks/version.rb
similarity index 53%
rename from lib/event_machine/version.rb
rename to lib/enhanced_hooks/version.rb
index 5cfd386..49cf141 100644
--- a/lib/event_machine/version.rb
+++ b/lib/enhanced_hooks/version.rb
@@ -1,3 +1,3 @@
-module EventMachine
+module EnhancedHooks
   VERSION = "0.4.1"
 end
diff --git a/lib/event_machine.rb b/lib/event_machine.rb
deleted file mode 100644
index c75be0b..0000000
--- a/lib/event_machine.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require "event_machine/version"
-require "active_support/dependencies"
-
-module EventMachine
-  mattr_accessor :app_root
-
-  def self.setup
-    yield self
-  end
-end
-
-require "event_machine/engine"
-require "event_machine/hooks"
diff --git a/lib/event_machine/engine.rb b/lib/event_machine/engine.rb
deleted file mode 100644
index a430aaf..0000000
--- a/lib/event_machine/engine.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module EventMachine
-  class Engine < Rails::Engine
-
-    initializer "event_machine.load_app_instance_data" do |app|
-      EventMachine.setup do |config|
-        config.app_root = app.root
-      end
-    end
-
-    #initialize "event_machine.load_static_assets" do |app| 
-    #  app.middleware.use ::ActionDispatc::Static, "#{root}/public"
-    #end
-
-    initializer "event_machine.application" do
-      ActiveSupport.on_load :action_controller do
-        include EventMachine::Hooks
-      end
-    end
-   
-  end
-end
diff --git a/lib/generators/event_machine/event_machine_generator.rb b/lib/generators/enhanced_hooks/enhanced_hooks_generator.rb
similarity index 78%
rename from lib/generators/event_machine/event_machine_generator.rb
rename to lib/generators/enhanced_hooks/enhanced_hooks_generator.rb
index ead7b4f..75c21d3 100644
--- a/lib/generators/event_machine/event_machine_generator.rb
+++ b/lib/generators/enhanced_hooks/enhanced_hooks_generator.rb
@@ -1,5 +1,5 @@
 require 'rails/generators'
-class EventMachineGenerator < Rails::Generators::Base
+class EnhancedHooksGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
 
   argument :this_event_name, :type => :string
@@ -7,7 +7,7 @@ class EventMachineGenerator < Rails::Generators::Base
   argument :action_name,     :type => :string
 
   def generate_event
-    template "event.rb", "#{EventMachine::Hooks::EVENTS_DIR}/#{parsed_event_name}_event.rb"
+    template "event.rb", "#{EnhancedHooks::Hooks::EVENTS_DIR}/#{parsed_event_name}_event.rb"
     template "functional_test.rb", "test/functional/events/#{parsed_event_name}_test.rb"
   end
 
diff --git a/lib/generators/event_machine/templates/event.rb b/lib/generators/enhanced_hooks/templates/event.rb
similarity index 100%
rename from lib/generators/event_machine/templates/event.rb
rename to lib/generators/enhanced_hooks/templates/event.rb
diff --git a/lib/generators/event_machine/templates/functional_test.rb b/lib/generators/enhanced_hooks/templates/functional_test.rb
similarity index 100%
rename from lib/generators/event_machine/templates/functional_test.rb
rename to lib/generators/enhanced_hooks/templates/functional_test.rb