Rename a couple of functions.