Patch up the names in the comment