Better data model naming

Too generic, refactor to be more explicit. ie. Artist -> XboxArtist