Fixed inconsistent labelling of cohorts.  Closes #8