MAINT: r_server -> r_client