refac client names and update doc