Rename functions.
Work with more rubies.