More consistant naming of the player