This also updates the glossary to refer to the domain model, if they share a term, which is also what is done in videoshop.