Switch to player-based keys in preparation for UUIDs