Revised glossary per emails about minor subentries

Change-Id: If3ab4b05299e28b7c5dcd2a542cf7416614983e8