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

Do not use deprecated terms

Closes #5

See merge request !8
2 jobs for develop-v2.1.1
in 2 minutes and 50 seconds, using 0 compute credits, and was queued for 3 minutes and 34 seconds