More consistent naming of preferences related to deprecations.