Resolved merge conflicts
Further naming convention cleanups to batch runner code
Coding convention cleanups for zonal stats