Fix term names according to specification.

Closes #38
Merge pull request #40 from alvarolopez/stable/folsom

Fix term names according to specification.