Added setting
New naming convention