Use field names consistent with other tables