Fix var renames