Changed getter and setter names