change use of metavars