Revert "fixed namespacing issues"

This reverts commit 30b1bfcb68d72a12929c0d6d18cdbf659d89c824.