JBIDE-14399 - Updates to names

I did look into swapping out some of the jars to use existing wrapper plug-ins and at this point I can't get it to jive. I will continue to look at it, but for now this fixes the problems mentioned in the JIRA.