[TASK] Namespacify where not already done