replaced namespace macros with namespace declarations.