Rename columns and add relationship