i2csw: remove _NUM in function names