[Upg] Namespace reorganisation