Remove old trip column.
Make column names consistent.