Merge branch 'issue-4' into 'develop-v2.1.1'

Deprecated terms have been replaced.

Closes #4

See merge request !7