Rename more local index variables