Use more regular language

Closes #118