Yes, that happened but by the way you set him up you made it seem like he was from Aiur his entire life, not Shakuras, where the Dark Templar were from. Probably just a matter of perspective, but the way I see it his Planet of Origin should have been Shakuras, not Aiur if that was the case.