Improved naming of type parameters.