Add NS prefix to source files

Latest revision includes NS* source files