More namespace updates

squash me