Additional namespace changes.