Minor adjustments regarding column names