Change all the names
Resolve merge conflict
Merge pull request #24 from Cynaria/name_change

Name change