Renaming things to be aligned with the project description