Fix term names according to specification.

Closes #38