7.x grammar fixes

Main fixes:
 - consistent 'PID' capitalization
 - More consistent error messages