Change retains annotation from using term arguments to using type arguments

Change retains annotation from using term arguments to using type arguments #35840