underscores in x-headers look awkward, should we replace them by dashes?