Bug fix: when the names are changed we can not assume the display name
will keep the same