I agree - however, CheckStyle gives me warnings on that then. Update CheckStyle config to allow underscores in type names?