Adapt to renamed SWIG bindings