Namespace cleanup

Created by  Eelco Dolstra  on July 7, 2015
OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC
In channels
main
upstream
Change contents