More SWIG types.
More types and names refactor.