Refactor a few more method names