Clean up some wording.
Use separate files, to avoid making the XML too big and uneditable. This breaks the PDF build.