Some refactor also start deprecating the stupid camel case typedefs go to a more idiomatic route like server_t etc