Minor renaming of setters/getters