Rename setters to use standard order