The Panopticon/Confusing regenerations

There is a problem when referring to the Doctor's regenerations. Because of the revelation of the War Doctor's regeneration and Ten's aborted regeneration counting, the way regenerations are now numbered is really confusing and inconsistent. Examples of this are on the Regeneration article. Sometimes Tenth regeneration refers to the Tenth to Eleventh Doctor's regeneration, and sometimes it refers to the Ninth Doctor's regeneration. It get's confusing and annoying. I suggest we label the Doctor's Regenerations to refer to the Doctor that is regenerating. For example the War Doctor's regeneration wouldn't be referred to as the ninth regeneration, but instead War's regeneration or the War Doctor's regeneration. The Eleventh Doctor's regeneration would be called Eleven's regeneration. Also we would call the Tenth Doctor's aborted regeneration the Metacrisis regeneration. We could still count it as using a regeneration of his cycle, it just wouldn't be numbered. This would make referring to the Doctor's regenerations a lot less confusing.