These are the only ways I've ever really heard the terms (and those distinctions) as long as I've been hearing them. My understanding of polyfidelity was that it was a completely closed relationship (with no real chance for add-ons) that happened to involve more than two people. Though I think that line between "swinging" and "poly" is a far more contentious debate, to be sure.