#8 Refactor name project 2