Cleaned up events, renamed the whole shebang