fixed the namespace naming convention
updated the #endif directives