We need to either leave our current definition alone with all the confusion that goes along with it, or go back to the drawing board and come up with something that works better.
There's no confusion with the system Lanidrak suggested first. It's a perfect system in all possible scenarios and there is zero room for interpretation.
This "intent" thing you propose, now
that's confusion. Not only do I need to look at the cards, but I also need to think about what the person is intending to do with them.
With Lanidrak's system all you need to do it look at the top right corner of the card and the rest is math. It's can't get any simpler than that.