minor mods for naming convention change