Adjusting glossary titles and term/definitions.

#319 #377