added product name to billing products and removed product id to billing rules