Princess Twillight 2.0/Ultimate Twilight

I brought this up some time ago but it did not get much attention, so given shifts in the relevant context since then here we go again:
 
There are currently two tags, princess twilight 2.0 and ultimate twilight, which mean exactly the same thing. princess twilight 2.0 seems to have been created to refer to what Twilight looks like in “The Last Problem”, but is applied fairly indiscriminately to any image where Twilight has a Luna- or Celestia-like bodytype, resulting in the two tags being entirely synonymous in what they’re used for. I don’t see much of a benefit in keeping them separate.
 
princess twilight 2.0 implies spoiler:s09e26, which, if it keeps getting added to pre-Season 9 pictures that have nothing to do with that episode, is kind of an issue.
 
princess twilight 2.0 currently has far more hits, but ultimate twilight has seniority and harmonizes better with ultimate chrysalis, ultimate luna and ultimate cadance. If we’re using a family of tags with closely related meanings, it would make sense to use a shared template for them.
 
So. What do?

My gut feeling is to keep the two tags separate, in sort of the same way Nightmare Moon-esque versions of Celestia aren’t tagged with the specific version tag of Daybreaker (though they are often tagged with specific tag Nightmare Star, so who knows…), but I don’t mind one way or the other.
 
Also, should the ultimate tags imply their respective older tag?

@Dragonpone  
If the two tags are kept separate, which might be an option, then I think there should be a clearer separation between them – say, having princess twilight 2.0 refer specifically to images of Celestia-like Twilight linked to “The Last Problem” and ultimate twilight to all others, and ideally make that clear in their descriptions. Alternatively, perhaps princess twilight 2.0 could serve as a subset of and imply ultimate twilight under the same definition.
 
The main issue to me is that there isn’t necessarily a great visual distinction between the two, so without context it might be difficult to tell whether a given powered-up Twilight is or isn’t a reference to that specific episode, unlike how Daybreaker has a fairly distinctive design.  

 
Hmm. Hadn’t thought of that, but if they stay separate then princess twilight 2.0 definitely should, and ultimate twilight probably should also.