Renaming classes so that the status can be updated
Merge pull request #80 from guardian/match-status-and-2183

Renaming classes so that the status can be updated