Properly update the name in case there is no match