Rename bla-batch -> batch