Make terminology more consistent and add link to glossary

Change-Id: I46bbba560e14a917857cd89691986019d90b1550
Reviewed-by: hjk <qthjk@ovi.com>