renames
Merge branch 'refactoring' of https://github.com/Yuugo/Health-Informatics-Social-Phobia into refactoring