Fixed some column renames that didn't get committed with the merge for some reason...