Rename things to be namespaced