More glossary terms

Change-Id: I4d9d1d8e12511274aa5cb87f04366d840f16b397