cleanup + updated the name of NB module projects
Signed-off-by:jonathanlermitage <jonathan.lermitage@gmail.com>