Adding the Y/ybu node name fix to the standard grammar as well.