Rename variables and verify reads fill buffer