Better name homogenization