Revert "changes to team score queries"

This reverts commit 5cd445447ab4594e24b7d4489f630ea71c382595.
Rename Team Opponent