Changed the name of a couple of functions in pairs.