Rename temporary vars to numbered var names after conversion