Started renaming some functions.