Refactoring: better naming of getters and setters.