Better parsing of client_id to make client_name