Fix event system and rename/shift methods