Renaming to match RoR naming conventions.