[TASK] Improve namespacing