Resolve some admin config problems and renaming sources names