Rename temp variables