Given that royalty are allowed to make it up as they go along (see
this about Prince Philip), not to mention that they keep creating and recreating titles, I can't get too caught up what is strictly correct, just as long as it's obvious who we are talking about (which is often the real problem).