recreated naming stuff
Merge branch 'master' of github.com:srct/advisor