diff --git a/config/environment.rb b/config/environment.rb
index c63ea2fc..8ff43e0a 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -57,8 +57,6 @@ Rails::Initializer.run do |config|
 	# ActionMailer::Base.deliveries array.
 	#config.action_mailer.delivery_method = :test
 	config.action_mailer.delivery_method = :smtp  
-	
-	config.active_record.table_name_prefix = "rdm_"
 end
 
 ActiveRecord::Errors.default_error_messages = {
diff --git a/db/migrate/041_rename_comment_to_comments.rb b/db/migrate/041_rename_comment_to_comments.rb
index aedad002..93677e57 100644
--- a/db/migrate/041_rename_comment_to_comments.rb
+++ b/db/migrate/041_rename_comment_to_comments.rb
@@ -1,10 +1,10 @@
 class RenameCommentToComments < ActiveRecord::Migration
   def self.up
-    rename_column(:comments, :comment, :comments) if ActiveRecord::Base.connection.columns("comments").detect{|c| c.name == "comment"}
-    rename_column(:wiki_contents, :comment, :comments) if ActiveRecord::Base.connection.columns("wiki_contents").detect{|c| c.name == "comment"}
-    rename_column(:wiki_content_versions, :comment, :comments) if ActiveRecord::Base.connection.columns("wiki_content_versions").detect{|c| c.name == "comment"}
-    rename_column(:time_entries, :comment, :comments) if ActiveRecord::Base.connection.columns("time_entries").detect{|c| c.name == "comment"}
-    rename_column(:changesets, :comment, :comments) if ActiveRecord::Base.connection.columns("changesets").detect{|c| c.name == "comment"}
+    rename_column(:comments, :comment, :comments) if ActiveRecord::Base.connection.columns(Comment.table_name).detect{|c| c.name == "comment"}
+    rename_column(:wiki_contents, :comment, :comments) if ActiveRecord::Base.connection.columns(WikiContent.table_name).detect{|c| c.name == "comment"}
+    rename_column(:wiki_content_versions, :comment, :comments) if ActiveRecord::Base.connection.columns(WikiContent.versioned_table_name).detect{|c| c.name == "comment"}
+    rename_column(:time_entries, :comment, :comments) if ActiveRecord::Base.connection.columns(TimeEntry.table_name).detect{|c| c.name == "comment"}
+    rename_column(:changesets, :comment, :comments) if ActiveRecord::Base.connection.columns(Changeset.table_name).detect{|c| c.name == "comment"}
   end
 
   def self.down