Refactor setters names