Do not mangle names where we don't actually need it