Revert "Revert "Namespaced some functions""

This reverts commit 00410686b840422a5047a34a17849647c12a8bcd.