Made column names consistent