[BUGFIX] Incomplete migration to namespaces