Replace zip/zip by zip in samples