Rename the wrapper to client