Renaming Entity to Work

Work is a tiny bit more specific than Entity, and I would prefer to
convey a more specific concept
Merge branch 'rename-entity-to-work'

* rename-entity-to-work:
  Renaming Entity to Work