Fix a namespace for the main
Merge branch 'fixMainNs'