Non-functional naming changes

Non-functional name changes to clarify the purpose of several methods
and correct some spelling mistakes.