diff --git a/lib/geocoder/models/mongodb_base.rb b/lib/geocoder/models/mongo_base.rb
similarity index 98%
rename from lib/geocoder/models/mongodb_base.rb
rename to lib/geocoder/models/mongo_base.rb
index eee7ce4ef1a7944a5e8591c70aa504141986ebde..393e007fbd27793960224a222801838e674c1ab4 100644
--- a/lib/geocoder/models/mongodb_base.rb
+++ b/lib/geocoder/models/mongo_base.rb
@@ -6,7 +6,7 @@ module Geocoder
   # Methods for invoking Geocoder in a model.
   #
   module Model
-    module MongoDBBase
+    module MongoBase
 
       ##
       # Set attribute names and include the Geocoder module.
diff --git a/lib/geocoder/models/mongo_mapper.rb b/lib/geocoder/models/mongo_mapper.rb
index 89f1c7c70e0d143a41a356df7eafd379eeadfc40..a093f6bf056a1418ce422c38d7c80994ae3a1011 100644
--- a/lib/geocoder/models/mongo_mapper.rb
+++ b/lib/geocoder/models/mongo_mapper.rb
@@ -1,11 +1,11 @@
 require 'geocoder/models/base'
-require 'geocoder/models/mongodb_base'
+require 'geocoder/models/mongo_base'
 
 module Geocoder
   module Model
     module MongoMapper
       include Base
-      include MongoDBBase
+      include MongoBase
 
       def self.included(base); base.extend(self); end
 
diff --git a/lib/geocoder/models/mongoid.rb b/lib/geocoder/models/mongoid.rb
index a6e40673ef7403dc36909705146a68495c68c75b..e3ca53a3254c38ca9145f1db221727a2727c5486 100644
--- a/lib/geocoder/models/mongoid.rb
+++ b/lib/geocoder/models/mongoid.rb
@@ -1,11 +1,11 @@
 require 'geocoder/models/base'
-require 'geocoder/models/mongodb_base'
+require 'geocoder/models/mongo_base'
 
 module Geocoder
   module Model
     module Mongoid
       include Base
-      include MongoDBBase
+      include MongoBase
 
       def self.included(base); base.extend(self); end