Rename type variables to possibly improve clarity.