- Improved for normalized name.