Revert "Namespace change"

This reverts commit 00015cc8ffd9d762e6f70302a572ca57f5713f2f.