Client: Renamed variables again