aligning terminology with product
Merge pull request #34 from zendesk/maxime/terminologyfix

[ZD#694781] Aligning terminology with product