Few missing changes for fact names, and grill-client changes
corresponding to the param name changes