Feature/zip file names fixed