CONN-1202: Fixed remaining namespace issue