update some namespaces
Merge branch 'master' of github.com:Incubatio/yam