Refactors member names to be clearer