Change vocabulary to make more sense in English
Reflect vocabulary change in docs
Merge pull request #1 from shadyvb/patch-1

Change vocabulary to make more sense in English