Fix some functions that weren't properly namespaced.