add back name munging