Rename tests/variables for recent changes