diff --git a/init.rb b/init.rb
index 69ac0ad8..736e004c 100644
--- a/init.rb
+++ b/init.rb
@@ -1,3 +1,3 @@
 require 'rubygems'
 require 'active_support'
-require 'tb_test_helpers'
\ No newline at end of file
+require 'shoulda'
\ No newline at end of file
diff --git a/lib/color.rb b/lib/color.rb
index 0210517e..0a1a777e 100644
--- a/lib/color.rb
+++ b/lib/color.rb
@@ -3,7 +3,7 @@ require 'test/unit/ui/console/testrunner'
 # Completely stolen from redgreen gem
 #
 # Adds colored output to your tests.  Specify <tt>color: true</tt> in 
-# your <tt>test/tb_test_helpers.conf</tt> file to enable.
+# your <tt>test/shoulda.conf</tt> file to enable.
 #
 # *Bug*: for some reason, this adds another line of output to the end of 
 # every rake task, as though there was another (empty) set of tests.  
diff --git a/lib/shoulda.rb b/lib/shoulda.rb
index 679756c8..27b0562f 100644
--- a/lib/shoulda.rb
+++ b/lib/shoulda.rb
@@ -3,8 +3,8 @@ require 'context'
 require 'general'
 require 'yaml'
 
-config_file = "tb_test_helpers.conf"
-config_file = defined?(RAILS_ROOT) ? File.join(RAILS_ROOT, "test", "tb_test_helpers.conf") : File.join("test", "tb_test_helpers.conf")
+config_file = "shoulda.conf"
+config_file = defined?(RAILS_ROOT) ? File.join(RAILS_ROOT, "test", "shoulda.conf") : File.join("test", "shoulda.conf")
 
 tb_test_options = (YAML.load_file(config_file) rescue {}).symbolize_keys
 require 'color' if tb_test_options[:color]
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 6f614923..c2dc93cc 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -3,4 +3,4 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 require 'rubygems'
 require 'active_support'
 require 'test/unit' 
-require 'tb_test_helpers'
+require 'shoulda'