simplify client names
Changes from review