Added type parameter renaming.