To me this is the most compelling reason to just hold tight and wait for a bit for more dust to settle.
I still feel persona is not quite a right fit, but the risk here is going through a 2000 lines of code rename just to need to repeat it again in a year when new terminology pops up.
This is a very very tough one.