not sure why these didn't get removed from upstream merge.
fix double scoping, change "messenger" for namespace