More namespace changes.