refactor some more method names