Adapt to namespace changes.