diff --git a/README b/README
index 96d69b5..6fed291 100644
--- a/README
+++ b/README
@@ -27,8 +27,14 @@ How to install (Work in progress)
 3.2 cd to the dir
 3.3 gem build dm-tokyo-cabinet-adapter.gemspec 
 3.4 gem install dm-tokyo-cabinet-adapter-0.0.1.gem
-4. Set data dir
-5. Setup DataMapper.setup
+4. Create data dir
+5. Setup database.yml like below
+
+:development: 
+  :adapter: tokyo_cabinet
+  :data_path: <%= Pathname(__FILE__).dirname.expand_path + 'data' %>
+
+6. The rest is usual way to setup datamapper on Merb.
 
 Further research topics/TODO
 - Performance benchmarking.
diff --git a/dm-tokyo-cabinet-adapter.gemspec b/dm-tokyo-cabinet-adapter.gemspec
index 6ed613f..69d1aa1 100644
--- a/dm-tokyo-cabinet-adapter.gemspec
+++ b/dm-tokyo-cabinet-adapter.gemspec
@@ -6,14 +6,13 @@ Gem::Specification.new do |s|
   s.date = %q{2008-11-15}
   s.description = %q{A DataMapper adapter for Tokyo Cabinet}
   s.email = %q{inouemak@googlemail.com}
-  s.files = ["lib/tc_adapter.rb", "README", "Rakefile", "dm-tokyo-cabinet-adapter.gemspec", "spec/tc_adapter_spec.rb", "spec/spec_helper.rb"]
+  s.files = ["lib/tokyo_cabinet_adapter.rb", "README", "dm-tokyo-cabinet-adapter.gemspec", "spec/tokyo_cabinet_adapter_spec.rb", "spec/spec_helper.rb"]
   s.homepage = %q{http://github.com/makoto/dm-tokyo-cabinet-adapter}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.2.0}
   s.summary = %q{A DatMapper adapter for Tokyo Cabinet}
-  s.test_files = ["spec/tc_adapter_spec.rb", "spec/spec_helper.rb"]
+  s.test_files = ["spec/tokyo_cabinet_adapter_spec.rb", "spec/spec_helper.rb"]
+  s.add_runtime_dependency(%q<dm-core>, ["> 0.0.0"])
 end
 
 
-require 'dm-core'
-require 'tokyocabinet'
diff --git a/lib/tc_adapter.rb b/lib/tokyo_cabinet_adapter.rb
similarity index 100%
rename from lib/tc_adapter.rb
rename to lib/tokyo_cabinet_adapter.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 09395ea..392a695 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,8 @@
 require 'rubygems'
+require 'dm-core'
+
 require 'pathname'
-require Pathname(__FILE__).dirname.parent.expand_path + 'lib/tc_adapter'
+require Pathname(__FILE__).dirname.parent.expand_path + 'lib/tokyo_cabinet_adapter'
 
 DataMapper.setup(:default, {
   :adapter => 'tokyo_cabinet',
diff --git a/spec/tc_adapter_spec.rb b/spec/tokyo_cabinet_adapter_spec.rb
similarity index 100%
rename from spec/tc_adapter_spec.rb
rename to spec/tokyo_cabinet_adapter_spec.rb