add more analytics and change event name