Update ZipCleaner for new naming conventions
Merge pull request #1626 from Cottser/zipcleaner

Update ZipCleaner for new naming conventions