lint
Merge pull request #718 from Yangqing/dev

More namespace cleaning.