Updated TestPlan: added naming convention