Rename type args.
Missed tests.