Refactor method names
Spelling