Rename various utils to be more consistent and explicit