Added back collection name validation... accidently clobbered those
changes.