I think you're right, and to add to that, Suboxone is Buprenorphine AND Naloxone (a partial antagonist, iirc) while Subutex is just Buprenorphine. I've ordered & used straight buprenorphine on more than one occasion with fantastic results, although at the moment i'm not sure who exactly is reliably sending it right now.