Code cleanup

Changed the names of some methods to better reflect what they do, or to be more consistent with other names