Removed NBI from classname
Renamed class
Merge branch 'master' into i2p