Make '-name' option of the 's_client' more generic