Simplify code for department name fixups
Test department fixup as well