Feature/departments rename