started aligning of terminology with blog post
Merge remote-tracking branch 'origin/master'