Re: What is "canon?"
Is Spock Vulcan or Vulcanian? Were the Klingons conquered by the Federation, or just became allies?
That's just a difference in terminology. I don't think using one precludes the other one from existing.
"I tell you what you all need, you need to take a thirteenth step, down off your high horse." - Hank Hill, King of the Hill