work in progress on identification, identifiers (and minor cleanup)

Rieks Joostenrequested to merge
terminology-rieks into master

Merge request reports