diff --git a/app/models/principal.rb b/app/models/principal.rb
index f2bec0e..32e330a 100644
--- a/app/models/principal.rb
+++ b/app/models/principal.rb
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Principal < ActiveRecord::Base
-  set_table_name "#{table_name_prefix}users#{table_name_suffix}"
+  self.table_name = "#{table_name_prefix}users#{table_name_suffix}"
 
   has_many :members, :foreign_key => 'user_id', :dependent => :destroy
   has_many :memberships, :class_name => 'Member', :foreign_key => 'user_id', :include => [ :project, :roles ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name"
diff --git a/lib/plugins/acts_as_versioned/lib/acts_as_versioned.rb b/lib/plugins/acts_as_versioned/lib/acts_as_versioned.rb
index 36442b2..f272a57 100644
--- a/lib/plugins/acts_as_versioned/lib/acts_as_versioned.rb
+++ b/lib/plugins/acts_as_versioned/lib/acts_as_versioned.rb
@@ -273,7 +273,7 @@ module ActiveRecord #:nodoc:
 
           versioned_class.cattr_accessor :original_class
           versioned_class.original_class = self
-          versioned_class.set_table_name versioned_table_name
+          versioned_class.table_name =  versioned_table_name
           versioned_class.belongs_to self.to_s.demodulize.underscore.to_sym, 
             :class_name  => "::#{self.to_s}", 
             :foreign_key => versioned_foreign_key
diff --git a/lib/plugins/awesome_nested_set/spec/awesome_nested_set_spec.rb b/lib/plugins/awesome_nested_set/spec/awesome_nested_set_spec.rb
index 1060bba..2bd418c 100644
--- a/lib/plugins/awesome_nested_set/spec/awesome_nested_set_spec.rb
+++ b/lib/plugins/awesome_nested_set/spec/awesome_nested_set_spec.rb
@@ -763,7 +763,7 @@ describe "AwesomeNestedSet" do
 
   it "should not error on a model with attr_accessible" do
     model = Class.new(ActiveRecord::Base)
-    model.set_table_name 'categories'
+    model.table_name =  'categories'
     model.attr_accessible :name
     lambda {
       model.acts_as_nested_set
diff --git a/lib/plugins/awesome_nested_set/spec/support/models.rb b/lib/plugins/awesome_nested_set/spec/support/models.rb
index 816b682..590d013 100644
--- a/lib/plugins/awesome_nested_set/spec/support/models.rb
+++ b/lib/plugins/awesome_nested_set/spec/support/models.rb
@@ -3,12 +3,12 @@ class Note < ActiveRecord::Base
 end
 
 class Default < ActiveRecord::Base
-  set_table_name 'categories'
+  self.table_name =  'categories'
   acts_as_nested_set
 end
 
 class ScopedCategory < ActiveRecord::Base
-  set_table_name 'categories'
+  self.table_name =  'categories'
   acts_as_nested_set :scope => :organization
 end
 
@@ -48,7 +48,7 @@ end
 
 class DefaultWithCallbacks < ActiveRecord::Base
 
-  set_table_name 'categories'
+  self.table_name =  'categories'
 
   attr_accessor :before_add, :after_add, :before_remove, :after_remove
 
diff --git a/lib/plugins/awesome_nested_set/test/awesome_nested_set_test.rb b/lib/plugins/awesome_nested_set/test/awesome_nested_set_test.rb
index 5252d80..5d10ca8 100644
--- a/lib/plugins/awesome_nested_set/test/awesome_nested_set_test.rb
+++ b/lib/plugins/awesome_nested_set/test/awesome_nested_set_test.rb
@@ -8,11 +8,11 @@ class AwesomeNestedSetTest < Test::Unit::TestCase
 
   class Default < ActiveRecord::Base
     acts_as_nested_set
-    set_table_name 'categories'
+    self.table_name =  'categories'
   end
   class Scoped < ActiveRecord::Base
     acts_as_nested_set :scope => :organization
-    set_table_name 'categories'
+    self.table_name =  'categories'
   end
 
   def test_left_column_default
diff --git a/lib/plugins/classic_pagination/test/fixtures/developer.rb b/lib/plugins/classic_pagination/test/fixtures/developer.rb
index f5e5b90..e2fb4bd 100644
--- a/lib/plugins/classic_pagination/test/fixtures/developer.rb
+++ b/lib/plugins/classic_pagination/test/fixtures/developer.rb
@@ -3,5 +3,5 @@ class Developer < ActiveRecord::Base
 end
 
 class DeVeLoPeR < ActiveRecord::Base
-  set_table_name "developers"
+  self.table_name =  "developers"
 end
diff --git a/lib/plugins/open_id_authentication/lib/open_id_authentication/association.rb b/lib/plugins/open_id_authentication/lib/open_id_authentication/association.rb
index 9654eae..47e516d 100644
--- a/lib/plugins/open_id_authentication/lib/open_id_authentication/association.rb
+++ b/lib/plugins/open_id_authentication/lib/open_id_authentication/association.rb
@@ -1,6 +1,6 @@
 module OpenIdAuthentication
   class Association < ActiveRecord::Base
-    set_table_name :open_id_authentication_associations
+    self.table_name =  :open_id_authentication_associations
 
     def from_record
       OpenID::Association.new(handle, secret, issued, lifetime, assoc_type)
diff --git a/lib/plugins/open_id_authentication/lib/open_id_authentication/nonce.rb b/lib/plugins/open_id_authentication/lib/open_id_authentication/nonce.rb
index c52f6c5..95ba3a4 100644
--- a/lib/plugins/open_id_authentication/lib/open_id_authentication/nonce.rb
+++ b/lib/plugins/open_id_authentication/lib/open_id_authentication/nonce.rb
@@ -1,5 +1,5 @@
 module OpenIdAuthentication
   class Nonce < ActiveRecord::Base
-    set_table_name :open_id_authentication_nonces
+    self.table_name =  :open_id_authentication_nonces
   end
 end