#8 Refactor name project