Change reporting format

Also introduce plan.Name