Changed taxonomy name and field names accordingly