fixing nikki's dumb names
Merge branch 'master' of https://github.com/rigeljs/ConversifyBackend