[TASK] Add missing content area label
[TASK] Switch to namespaces