New events and some changed names
Merge branch 'production' of github.com:ShaastraWebops/frontend into production
More event names changes