Right now we define resulting filename in the loop itself, which limits
ability to predict expected filename for another loop where list might
get filtered.
So to get more expected behaviour between tasks we always add filename
to the elements in vars.
Change-Id: I579980ea3a5e9349d25885530c979649cb6dcb81
18b36137dc