Raw name display is better, but still not prefect