Refactored "name" to "gamertag", along with a few other minor refactors