Add NS prefix to source files

Latest revision includes NS* source files
Merge pull request #2027 from bm-i/patch-1

Add NS prefix to source files