Fix naming issue with array of arrays of generic type parameters