Rename vtype to tp