Namespace fixes:
1) Added inline namespaces (kudos to Pablo);
2) Removed namespaces from definitions (now only in synopsis)