Straightening terminology

on wicked people request