A few terminology changes in the comments