No more double naming on output zip