Renaming things checkpoint
Completed renaming of things for consistency