Exchange name and department
Fix conflict