Revert "Revert underscore namespace"

This reverts commit 5147e41797010b6ea89a6b7b3be3e7a4a3783820.