More namespace change fixes