Added missing definitions
Conversation should be uppercase to be consisted
Merge pull request #384 from tvb/work21

Work21