Fix names in Client lib