Fix checkstyle

Restricting the names of generic types to single letters seems overly strict to me.

+review REVIEW-5254