Stop using the overloaded term Client