More namespace changes