Fix name conflict hack for Rails 3