diff --git a/lib/geocoder/models/base.rb b/lib/geocoder/models/base.rb
index aeaf4d9def4002775061bcd2a9d02c5fb17aeb2f..949354208500219ef9d910b68583b4bf09bc56d9 100644
--- a/lib/geocoder/models/base.rb
+++ b/lib/geocoder/models/base.rb
@@ -26,15 +26,15 @@ module Geocoder
       def geocoder_init(options)
         unless geocoder_initialized?
           @geocoder_options = {}
-          require "geocoder/orms/#{geocoder_file_name}"
-          include eval("Geocoder::Orm::" + geocoder_module_name)
+          require "geocoder/stores/#{geocoder_file_name}"
+          include eval("Geocoder::Store::" + geocoder_module_name)
         end
         @geocoder_options.merge! options
       end
 
       def geocoder_initialized?
         begin
-          included_modules.include? eval("Geocoder::Orm::" + geocoder_module_name)
+          included_modules.include? eval("Geocoder::Store::" + geocoder_module_name)
         rescue NameError
           false
         end
diff --git a/lib/geocoder/orms/active_record.rb b/lib/geocoder/stores/active_record.rb
similarity index 98%
rename from lib/geocoder/orms/active_record.rb
rename to lib/geocoder/stores/active_record.rb
index 96e4a80fbf17b25404738ec78a12a6d47135885b..dc4cd2d8f3c45131730524c5b5f829fbe31aea49 100644
--- a/lib/geocoder/orms/active_record.rb
+++ b/lib/geocoder/stores/active_record.rb
@@ -1,10 +1,10 @@
-require 'geocoder/orms/base'
-require 'geocoder/orms/active_record_legacy'
+require 'geocoder/stores/base'
+require 'geocoder/stores/active_record_legacy'
 
 ##
 # Add geocoding functionality to any ActiveRecord object.
 #
-module Geocoder::Orm
+module Geocoder::Store
   module ActiveRecord
     include Base
     include ActiveRecord::Legacy
diff --git a/lib/geocoder/orms/active_record_legacy.rb b/lib/geocoder/stores/active_record_legacy.rb
similarity index 98%
rename from lib/geocoder/orms/active_record_legacy.rb
rename to lib/geocoder/stores/active_record_legacy.rb
index e8db8bc72dae59c86e27940b632381a93d5a03f6..6a28fd5637f4c89b5de859bbfaad9005c2853a91 100644
--- a/lib/geocoder/orms/active_record_legacy.rb
+++ b/lib/geocoder/stores/active_record_legacy.rb
@@ -1,4 +1,4 @@
-module Geocoder::Orm::ActiveRecord
+module Geocoder::Store::ActiveRecord
   module Legacy
 
     ##
diff --git a/lib/geocoder/orms/base.rb b/lib/geocoder/stores/base.rb
similarity index 99%
rename from lib/geocoder/orms/base.rb
rename to lib/geocoder/stores/base.rb
index 1b98ae8e043a87756693bcf7b414fe1173bc1f79..e0f909426a2bb6eb2d02999397f513dd485a1061 100644
--- a/lib/geocoder/orms/base.rb
+++ b/lib/geocoder/stores/base.rb
@@ -1,5 +1,5 @@
 module Geocoder
-  module Orm
+  module Store
     module Base
 
       ##
diff --git a/lib/geocoder/orms/mongoid.rb b/lib/geocoder/stores/mongoid.rb
similarity index 97%
rename from lib/geocoder/orms/mongoid.rb
rename to lib/geocoder/stores/mongoid.rb
index 308324d7764a0798fe5516a47fa843004bf18d98..9d1eabe019eedef5a62d4c20bc8f13c379a55bef 100644
--- a/lib/geocoder/orms/mongoid.rb
+++ b/lib/geocoder/stores/mongoid.rb
@@ -1,6 +1,6 @@
-require 'geocoder/orms/base'
+require 'geocoder/stores/base'
 
-module Geocoder::Orm
+module Geocoder::Store
   module Mongoid
     include Base