Revert "Namespaced some functions"

This reverts commit df5d01f3b15ef5176161c435576815130dd171d1.