Rename batch to entities