Updated the basename and name of some targets 

Updates some BUILD targets so that pants goal bundle .src/java:: doesn't create colliding bundles in dist/