-fix friendly names problems