Updated some field names

need to test more rules return values.