Remove name munging.