More renames of TypeRef to TypeReference