renaming of methods to be more consistent