Added in rename of Redshift fields