Change column names

Please review.

Schema needs to be dropped as column names have been changed. Data bags need to be updated.