[fix] Have identical function signatures for server and client