Ye ive heard it was frank the archer and alfred the fighter which would make sense but as you said they may have changed the companions abit. Tbh the most likely would be rogue and archer as that would cover all the "archytype" classes.