bring terminology more in line with docs or *Parser.hs

[kylegoetz]

Not sure which, but probably better than the random stuff I chose in the heat of the moment.