Fixes #2359 -- tweak grammar to use new name