Echoes from merging with Keating, fixed fee_plan to plan_type.