#5174 allow old_name to be abscent