Fix validation for collection names. Refs #14