DATACASS-91 - aligning terminology