Changed a couple of functions names around.