Merge "Rename ZipEntryName to ZipString"