renamed client class to be more consistent