use the name zip with *** alias for product consistently across data types
Merge branch 'kiama-merge-with-0.7.0-zip' into 0.7.0-kiama