generic team detection

this change should support any team names without having to add them
manually.