Renamed entityId to aggregateId
Renamed playerId to playerEmail