refactored client name