Adjust API to handle localized names (bug 1071820)