More cleanup of variable rename.