Rename refactoring and minor changes
Merge branch 'master' of https://github.com/ErPanfi/ProjectHCI
Rename refactoring