API: Fix up r44676: convert underscores to spaces in canonical names.