EE Master/Address Book Proper Name Formats

We seem to run the same issue every year where an employee will call and say that their name is incorrect on their W2.  Typically, it is an employee who has a Suffix (JR, SR, III) and no middle initial.

For example, if their name is John Smith JR, the W2 will print 'John JR Smith JR'.  In the Address Book (P01012), we have their Alpha Name as 'Smith, John JR', their Mailing Name as 'John Smith JR'.  In Who's Who (P0111), we have their Given Name as 'John', no Middle Name, and their Surname as 'Smith JR'.  The Suffix is also entered on the Personal screen (P0801EMP).