Event: clean up names