Fix unzip and cleanup file names to be variable