diff --git a/lib/rack/heartbeat.rb b/lib/rack/heartbeat.rb
index <HASH>..<HASH> 100644
--- a/lib/rack/heartbeat.rb
+++ b/lib/rack/heartbeat.rb
@@ -16,5 +16,5 @@ module Rack
   end
 end
 
-require 'heartbeat/railtie' if defined?(Rails)
+require File.expand_path('../heartbeat/railtie', __FILE__) if defined?(Rails)
 
diff --git a/lib/rack/heartbeat/railtie.rb b/lib/rack/heartbeat/railtie.rb
index <HASH>..<HASH> 100644
--- a/lib/rack/heartbeat/railtie.rb
+++ b/lib/rack/heartbeat/railtie.rb
@@ -1,4 +1,4 @@
-module Rack::Heartbeat
+module Rack
 
   class HeartBeatRailtie < Rails::Railtie
     initializer "heartbeat.initializer" do |app|
oh, and fix path / naming issues