Added support for new naming convention in gbatch