Wrapper and ref now use player names to identify them