updating terminology
Merge pull request #196 from janno42/develop

updating terminology