Updated the basename and name of some targets to that pants goal bundle src/java:: doesn't create colliding bundles in dist/