Fix spelling of macro names (patch from #9071).
Regenerate docs.
Fixes #9071.