Update names according to Adi's request.