Renaming some of this config options and starting descriptions