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

Testing Done:
ci running @ https://travis-ci.org/pantsbuild/pants/builds/31947112

Bugs closed: 453

Reviewed at https://rbcommons.com/s/twitter/r/847/