Renamed resovled_item and resolved parameters on gp_resolve_item_override macro