Yeah, it is, i keep mixing those two XD.
Differences shouldn't be really big. I mean, until you're a CE player or a 2000 r.io one, you can safely play with any covenant.
EDIT: now shiv has the enrage dispel baked in by default. Sub gets smoke bomb back but it's mostly for pvp since it just has the los effect and no dmg reduction.