better labelling for Java matches