Fixed a bug where the original name isn't handled properly

If the original name exists in the data set, revert to the default behaviour for efficiency.