FYI ... the IRS only looks at the first 4 letters of your last name, SS# and year of birth. Everything else can be dead wrong and the return will still process. Make the change as described above and don't worry about things too much. On the W-2 form the IRS only looks at the employer's EIN & your SS# so don't fret about getting your name/address exactly correct in the program.
