Finish name change in accordance with Gem conventions