Nay, I ain't using McAffee either.

EDIT: I found something that may be useful. I had generated 22 P2SH-P2WPKH addresses by clicking on the "receive bitcoins" button and another 2000 using compute. However, on the next restart of Qt, it moved ALL those addresses that I hadn't spent from into the P2PKH area, where they looked completely different. The only way I was able to tell was because they carried the labels I had given them. And the unused P2SH-P2WPKH field became empty. They were effectively all converted. I now had 2022 P2PKH addresses and none others.