Rename more types.