More consistent use of type variable names based on kind