diff --git a/lib/active_record_helpers.rb b/lib/active_record_helpers.rb
index a4cee6bd..276ec4c8 100644
--- a/lib/active_record_helpers.rb
+++ b/lib/active_record_helpers.rb
@@ -1,5 +1,5 @@
 module ThoughtBot # :nodoc:
-  module TestHelpers # :nodoc:
+  module Shoulda # :nodoc:
     # = Macro test helpers for your active record models
     #
     # These helpers will test most of the validations and associations for your ActiveRecord models.
diff --git a/lib/context.rb b/lib/context.rb
index 72ad6194..820f3200 100644
--- a/lib/context.rb
+++ b/lib/context.rb
@@ -1,5 +1,5 @@
 module ThoughtBot # :nodoc:
-  module TestHelpers # :nodoc:
+  module Shoulda # :nodoc:
     # = context and should blocks
     # 
     # A context block can exist next to normal <tt>def test_blah</tt> statements, 
diff --git a/lib/general.rb b/lib/general.rb
index 94c55e9c..4fcc6e59 100644
--- a/lib/general.rb
+++ b/lib/general.rb
@@ -1,5 +1,5 @@
 module ThoughtBot # :nodoc:
-  module TestHelpers # :nodoc:
+  module Shoulda # :nodoc:
     module General # :nodoc:
       
       module ClassMethods
diff --git a/lib/tb_test_helpers.rb b/lib/tb_test_helpers.rb
index c00e57a0..3c5a2972 100644
--- a/lib/tb_test_helpers.rb
+++ b/lib/tb_test_helpers.rb
@@ -13,12 +13,12 @@ module Test # :nodoc:
   module Unit # :nodoc:
     class TestCase
 
-      include ThoughtBot::TestHelpers::General::InstanceMethods
+      include ThoughtBot::Shoulda::General::InstanceMethods
 
       class << self
-        include ThoughtBot::TestHelpers::Context
-        include ThoughtBot::TestHelpers::ActiveRecord
-        include ThoughtBot::TestHelpers::General::ClassMethods    
+        include ThoughtBot::Shoulda::Context
+        include ThoughtBot::Shoulda::ActiveRecord
+        include ThoughtBot::Shoulda::General::ClassMethods    
       end
     end
   end