Minor name changes of lables and config files