namespace header cleanup stage 1
small namespace cleanup
commoncpp header namespace cleanup