Tweak setup.sh (undo some renames, remove a leftover 'zip' reference)