Change remote_* to client_* for 2.4 api changes