Adjust utility to check for swapped names.