Rename swig, cleanup patch