Slight renaming of a couple methods