*I mean*, it doesn't seem particularly difficult to rewrite them just in the way of good angel, bad angel (stemming from her "conscience", "morality" or even just fancies or personality cores rather than some hot and sour potato).
Then of course you'll have other priorities.. but I just wanted to underline how this representing a good chunk of what folk psychology is, is exactly the problem. Putting aside the indirect effect of making it seems like psychology as a whole is play-pretend unscientific voodoo, those concepts and their friends have helped to legitimize truly deranged shit. No offense taken or meant, but if we just let them finally die in silence we'd be in a better society.