Use Organization term in contacts table

Closes #549.