Tweaking terminology.

This is super long and has more information