reapply namespace change
Merge pull request #752 from Yangqing/sweep

reapply namespace change