Rename method names to be consistent.