Still more rename of settings to config