Remove needless "Client" prefix