Little changes to naming + events