Unmangle more names.