Renamed batches to RefBatch and OwnedBatch