Finish renaming in accordance with Gem conventions