Avoiding confusing terminology
Merge pull request #431 from mkcor/improvements

Avoiding confusing terminology