Simplify final zip name and mantain procedure (2/2)