Updated the table and field names