Fix term names according to specification.

Closes #38
Ensure that the appended categories does in fact exist.

Closes #43
Merge branch 'bug/43'.