Fixes #79 - Adding explicit matchup bank keys for each matchup
and now they are using the more standard abbreviated notation