Update dept mapping

Bringing over changes from backdrop-collector-plugins