More hyphens to underscores for WiX