Corrected the namespace usage in the header files

Correcting the mistakes