Added detection of friendly names