[SAGE Knowledge] Fix name suffixes