Renamed batch* to acf_batch*