Rename fai1,2phi to phiai1,2 to remain consistent with physics model