Checkpoint commit renaming some functions for clarity.