Now that we only have one model (res.config.settings). Uniformize everything according to the guidelines.