Changes to events handling and naming conventions