rename client_context to client