Revert "Revert "Add namespace""
3.1.2 is out so it doesn't matter if this works on earlier versions or not.

This reverts commit 745b60a2da94f1b784dd719d8000979ca71dc0ec.