another namespace change

i think that's it
Merge branch 'np-prefix' into giessel-dev