namespace converter part 5
Merge remote-tracking branch 'origin/energine.ns' into energine.ns