Rename method names to be more consistent