Renamed client-name variables