Method renaming

renamed several methods to be more consistent and descriptive