Rework naming scheme for xjc generated code