Fix class names from renaming process, Event