Minor changes in namespace names.
Fix: CodeLine #line broke multi-line macros
2.7: Minor changes