JBIDE-14399 - Updates to names