Introduces nbi.mode property and renamed nbi.[mode] properties and packages/class names