Moved and renamed some getters and setters