Change user to Sentry2 User

Other various fixes for scott swift