Change setting name, little refactor