Partial revert: keep main cpp-netlib library name