Changed function names for less typing.