Revised glossaries and names