Tidy up casual handling of column names