Adjust API to handle localized names (bug 1071820)

ok, I spent some brain power on it and figured out how to merge the two