Revert 'Client: Renamed variables'