[settings_improvement][CHG] respect our naming conventions