Issue #66 - more flexible handling of plan name formatting