[JAG] Rename Client to client