[TASK] Removed hard coded sub-namespace.