Prevent using same event when fixing a name
Make name fixer more generic