More glossary work

Change-Id: Ifb05bb2351cad8400f16545393ea74cf3c61d0ee