Mass refactor for type parameter renaming