Refactoring: change method names to something more understandable, hopefully.