Refactored event names and some files.