diff --git a/lib/mongo/gridfs/grid_store.rb b/lib/mongo/gridfs/grid_store.rb
index 467b282..e4958a1 100644
--- a/lib/mongo/gridfs/grid_store.rb
+++ b/lib/mongo/gridfs/grid_store.rb
@@ -43,7 +43,7 @@ module XGen
       #   }
       class GridStore
 
-        DEFAULT_ROOT_COLLECTION = 'gridfs'
+        DEFAULT_ROOT_COLLECTION = 'fs'
         DEFAULT_CONTENT_TYPE = 'text/plain'
 
         include Enumerable
diff --git a/tests/test_grid_store.rb b/tests/test_grid_store.rb
index 21f6b69..2aa33e0 100644
--- a/tests/test_grid_store.rb
+++ b/tests/test_grid_store.rb
@@ -10,8 +10,8 @@ class GridStoreTest < Test::Unit::TestCase
 
   @@db = Mongo.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
                    ENV['MONGO_RUBY_DRIVER_PORT'] || Mongo::DEFAULT_PORT).db('ruby-mongo-test')
-  @@files = @@db.collection('gridfs.files')
-  @@chunks = @@db.collection('gridfs.chunks')
+  @@files = @@db.collection('fs.files')
+  @@chunks = @@db.collection('fs.chunks')
 
   def setup
     @@chunks.clear