*8094* Standardize setting naming