Support for Rails 4 and rename gem for consistency