Fix variable names
Fix mixpanel usage