The new software is 'helpfully' inserting registered trademark symbols

How about “Joe Blow-D will face John Doe-R”?