Rename some functions in util.io, use in a couple more places