Okay, I've worn myself out replying in all different places in this thread, but I don't want you to think I was ignoring you LOL. So, basically my reply to this would "Yes." :D The terminology is abused and confusing, and all of us HERE, at least, seem to agree on what it should be, but isn't always (at least not in my experience).

And I completely agree with your examples of what should be gen vs. 'ship.:)