Fix output name munging.