Fix provider emails by adding all variables and rename data vars