Upgrade to latest bod-nsi release
imports, better naming