Rename some methods for consistency's sake
Update the tests