Rename of a couple of functions