getter and setters updated to new names