refactored names of settings