diff --git a/mongo-bson.gemspec b/bson.gemspec
similarity index 71%
rename from mongo-bson.gemspec
rename to bson.gemspec
index 84b69ac..d4a7242 100644
--- a/mongo-bson.gemspec
+++ b/bson.gemspec
@@ -1,9 +1,9 @@
-require "lib/mongo_bson"
+require "lib/bson"
 
 Gem::Specification.new do |s|
-  s.name = 'mongo_bson'
+  s.name = 'bson'
 
-  s.version = Mongo::BSON::VERSION
+  s.version = '1.0'#Mongo::BSON::VERSION
 
   s.platform = Gem::Platform::RUBY
   s.summary = 'Ruby implementation of BSON'
@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
 
   s.require_paths = ['lib']
 
-  s.files  = ['Rakefile', 'mongo-bson.gemspec', 'LICENSE.txt']
-  s.files += ['lib/mongo_bson.rb'] + Dir['lib/mongo_bson/**/*.rb']
+  s.files  = ['Rakefile', 'bson.gemspec', 'LICENSE.txt']
+  s.files += ['lib/bson.rb'] + Dir['lib/bson/**/*.rb']
   s.test_files = Dir['test/mongo_bson/*.rb']
 
   s.has_rdoc = true
diff --git a/mongo-extensions.gemspec b/bson_ext.gemspec
similarity index 88%
rename from mongo-extensions.gemspec
rename to bson_ext.gemspec
index 27657c1..b669f34 100644
--- a/mongo-extensions.gemspec
+++ b/bson_ext.gemspec
@@ -1,8 +1,8 @@
-require 'lib/mongo'
+require 'lib/bson'
 VERSION_HEADER = File.open(File.join(File.dirname(__FILE__), 'ext', 'cbson', 'version.h'), "r")
 VERSION        = VERSION_HEADER.read.scan(/VERSION\s+"(\d+\.\d+(\.\d+\w*)?)\"/)[0][0]
 Gem::Specification.new do |s|
-  s.name = 'mongo_ext'
+  s.name = 'bson_ext'
 
   s.version  = VERSION
   s.platform = Gem::Platform::RUBY
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = 'C extensions to accelerate the MongoDB Ruby driver. For more information about Mongo, see http://www.mongodb.org.'
 
   s.require_paths = ['ext']
-  s.files = ['Rakefile', 'mongo-extensions.gemspec']
+  s.files = ['Rakefile', 'bson_ext.gemspec']
   s.files += Dir['ext/**/*.rb'] + Dir['ext/**/*.c'] + Dir['ext/**/*.h']
   s.test_files = []
 
diff --git a/ext/cbson/version.h b/ext/cbson/version.h
index 2ab71f2..10cf4f4 100644
--- a/ext/cbson/version.h
+++ b/ext/cbson/version.h
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-#define VERSION "0.19.2"
+#define VERSION "0.20"
diff --git a/lib/mongo.rb b/lib/mongo.rb
index 8b16ef0..12aec33 100644
--- a/lib/mongo.rb
+++ b/lib/mongo.rb
@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 module Mongo
-  VERSION = "0.19.2"
+  VERSION = "0.20"
 end
 
 module Mongo