Merge "TIF: change the column names to be consistent with other fields"