shorten domain classes names and add handling for additional player name patten