Made naming of methods consistent
Merged modification of names with changes to containing code