Changed references of nickname to driverId